1 --- WindowMaker-0.80.0/WINGs/Examples/Makefile.am.orig Thu Oct 11 11:59:54 2001
2 +++ WindowMaker-0.80.0/WINGs/Examples/Makefile.am Thu Jan 3 06:09:41 2002
5 AUTOMAKE_OPTIONS = no-dependencies
8 noinst_PROGRAMS = connect server fontl puzzle
10 +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
11 + $(XFTLIBS) $(INTLIBS)
13 -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
17 -fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
19 -puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
21 -connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
23 -connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
26 -server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
28 -server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
30 +connect_LDADD = $(top_builddir)/WINGs/libWUtil.la $(LIBRARY_SEARCH_PATH) \
31 + $(NETLIBS) $(INTLIBS)
33 +server_LDADD = $(top_builddir)/WINGs/libWUtil.la $(LIBRARY_SEARCH_PATH) \
34 + $(NETLIBS) $(INTLIBS)
36 INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
37 - -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
38 + -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(HEADER_SEARCH_PATH) -DDEBUG
41 --- WindowMaker-0.80.0/WINGs/Extras/Makefile.am.orig Thu Oct 11 11:59:54 2001
42 +++ WindowMaker-0.80.0/WINGs/Extras/Makefile.am Thu Jan 3 06:12:10 2002
45 AUTOMAKE_OPTIONS = no-dependencies
49 # is this a kluge? if so, how should i do it?
50 includedir = @includedir@/WINGs
52 include_HEADERS = wtableview.h wtabledelegates.h
55 -lib_LIBRARIES = libExtraWINGs.a
56 +lib_LTLIBRARIES = libExtraWINGs.la
57 +libExtraWINGs_la_LIBADD = $(top_builddir)/WINGs/libWINGs.la
59 noinst_PROGRAMS = test
63 -libExtraWINGs_a_SOURCES = \
64 +libExtraWINGs_la_SOURCES = \
71 INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
72 - -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
73 + -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(HEADER_SEARCH_PATH)
75 -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
77 +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
78 + $(XFTLIBS) $(INTLIBS)
80 test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
82 --- WindowMaker-0.70.0.orig/WINGs/Makefile.am Thu Oct 4 05:39:17 2001
83 +++ WindowMaker-0.70.0/WINGs/Makefile.am Thu Oct 18 16:54:22 2001
86 SUBDIRS = WINGs . po Documentation Resources Examples Extras Tests
90 -#libWINGs_la_LDFLAGS = -version-info 1:1:0
92 bin_SCRIPTS = get-wings-flags get-wutil-flags
94 -lib_LIBRARIES = libWINGs.a libWUtil.a
95 +LDADD= libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
97 +lib_LTLIBRARIES = libWINGs.la libWUtil.la
98 +libWINGs_la_LIBADD = $(top_builddir)/wrlib/libwraster.la $(XFTLIBS)
100 -LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@
103 EXTRA_DIST = BUGS python/Makefile python/README python/WINGs.i \
104 python/WINGs.py python/setup.py python/test.py
108 -libWINGs_a_SOURCES = \
109 +libWINGs_la_SOURCES = \
117 -libWUtil_a_SOURCES = \
118 +libWUtil_la_SOURCES = \
122 diff -ur WindowMaker-CVS-20040723.orig/WINGs/Tests/Makefile.am WindowMaker-CVS-20040723/WINGs/Tests/Makefile.am
123 --- WindowMaker-CVS-20040723.orig/WINGs/Tests/Makefile.am 2004-04-11 07:01:02.000000000 +0200
124 +++ WindowMaker-CVS-20040723/WINGs/Tests/Makefile.am 2004-09-05 03:55:39.906430016 +0200
127 noinst_PROGRAMS = wtest wmquery wmfile testmywidget
129 -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
130 - @XFTLIBS@ @INTLIBS@
131 +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
132 + $(XFTLIBS) $(INTLIBS)
135 testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
137 -wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
140 EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
142 INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
143 - -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ \
144 + -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(XFTFLAGS) $(HEADER_SEARCH_PATH) \
148 --- WindowMaker-0.70.0.orig/WPrefs.app/Makefile.am Thu Oct 4 05:39:18 2001
149 +++ WindowMaker-0.70.0/WPrefs.app/Makefile.am Thu Oct 18 16:54:22 2001
152 INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
154 -WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
155 +WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
158 - $(top_builddir)/WINGs/libWINGs.a\
159 + $(top_builddir)/WINGs/libWINGs.la\
160 $(top_builddir)/wrlib/libwraster.la \
163 diff -Nur WindowMaker-0.70.0.orig/src/Makefile.am WindowMaker-0.70.0/src/Makefile.am
164 --- WindowMaker-0.70.0.orig/src/Makefile.am Thu Oct 4 05:39:18 2001
165 +++ WindowMaker-0.70.0/src/Makefile.am Thu Oct 18 16:54:22 2001
170 - $(top_builddir)/WINGs/libWINGs.a\
171 + $(top_builddir)/WINGs/libWINGs.la\
172 $(top_builddir)/wrlib/libwraster.la\
175 diff -Nur WindowMaker-0.70.0.orig/test/Makefile.am WindowMaker-0.70.0/test/Makefile.am
176 --- WindowMaker-0.70.0.orig/test/Makefile.am Sat Oct 2 23:16:11 1999
177 +++ WindowMaker-0.70.0/test/Makefile.am Thu Oct 18 16:54:22 2001
180 wtest_SOURCES = wtest.c
182 -wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@
183 +wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@
186 INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib
187 --- WindowMaker-0.80.0/util/Makefile.am~ Thu Oct 11 11:59:54 2001
188 +++ WindowMaker-0.80.0/util/Makefile.am Thu Jan 3 07:12:53 2002
191 AUTOMAKE_OPTIONS = no-dependencies
193 -pkgdatadir = $(datadir)/@PACKAGE@
195 bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle seticons geticonset wmsetbg wmsetup wmagnify
197 bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wmchlocale wkdemenu.pl\
199 wkdemenu.pl wmchlocale.in wcopy wpaste
201 INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
202 - @HEADER_SEARCH_PATH@ \
203 - -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
204 + $(HEADER_SEARCH_PATH) \
205 + -DETCDIR=\"$(sysconfdir)\" -DDATADIR=\"$(pkgdatadir)\"
207 -liblist= @LIBRARY_SEARCH_PATH@ @INTLIBS@
208 +liblist= $(LIBRARY_SEARCH_PATH) $(INTLIBS)
210 -wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
211 +wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
213 -wdread_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
214 +wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
216 -wxcopy_LDADD = @XLFLAGS@ @XLIBS@
217 +wxcopy_LDADD = $(XLFLAGS) $(XLIBS)
219 -wxpaste_LDADD = @XLFLAGS@ @XLIBS@
220 +wxpaste_LDADD = $(XLFLAGS) $(XLIBS)
222 -getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
223 +getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
226 - $(top_builddir)/WINGs/libWUtil.a \
227 - @XLFLAGS@ @XLIBS@ $(liblist)
228 + $(top_builddir)/WINGs/libWUtil.la \
229 + $(XLFLAGS) $(XLIBS) $(liblist)
231 -seticons_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist)
232 +seticons_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist)
234 -geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist)
235 +geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist)
238 - $(top_builddir)/WINGs/libWINGs.a \
239 + $(top_builddir)/WINGs/libWINGs.la \
240 $(top_builddir)/wrlib/libwraster.la \
241 @XFTLIBS@ @INTLIBS@ @DLLIBS@
244 - $(top_builddir)/WINGs/libWINGs.a \
245 + $(top_builddir)/WINGs/libWINGs.la \
246 $(top_builddir)/wrlib/libwraster.la \
247 @XFTLIBS@ @INTLIBS@ @DLLIBS@
250 - $(top_builddir)/WINGs/libWINGs.a \
251 + $(top_builddir)/WINGs/libWINGs.la \
252 $(top_builddir)/wrlib/libwraster.la \
253 @XFTLIBS@ @INTLIBS@ @DLLIBS@
255 --- WindowMaker-0.70.0.orig/wmlib/Makefile.am Mon Apr 10 02:59:35 2000
256 +++ WindowMaker-0.70.0/wmlib/Makefile.am Thu Oct 18 16:54:22 2001
259 AUTOMAKE_OPTIONS = no-dependencies
261 -lib_LIBRARIES = libWMaker.a
262 +lib_LTLIBRARIES = libWMaker.la
263 +libWMaker_la_LIBADD = $(X_LIBS) -lX11
265 include_HEADERS = WMaker.h
267 INCLUDES = $(DFLAGS) @XCFLAGS@
269 -libWMaker_a_SOURCES = \
270 +libWMaker_la_SOURCES = \
278 +libWMaker_la_LDFLAGS = -version-info 1:1:1
280 DISTCLEANFILES = wmlib.pc