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 --- WindowMaker-0.80.0/WINGs/Tests/Makefile.am.orig Thu Oct 11 11:59:54 2001
123 +++ WindowMaker-0.80.0/WINGs/Tests/Makefile.am Thu Jan 3 06:14:31 2002
126 noinst_PROGRAMS = wtest wmquery wmfile testmywidget
128 -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
129 - @XFTLIBS@ @INTLIBS@
131 +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
132 + $(XFTLIBS) $(INTLIBS)
134 testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
136 -wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
139 EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
141 INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
142 - -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
143 + -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(HEADER_SEARCH_PATH)
146 --- WindowMaker-0.70.0.orig/WPrefs.app/Makefile.am Thu Oct 4 05:39:18 2001
147 +++ WindowMaker-0.70.0/WPrefs.app/Makefile.am Thu Oct 18 16:54:22 2001
150 INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
152 -WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
153 +WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
156 - $(top_builddir)/WINGs/libWINGs.a\
157 + $(top_builddir)/WINGs/libWINGs.la\
158 $(top_builddir)/wrlib/libwraster.la \
161 diff -Nur WindowMaker-0.70.0.orig/src/Makefile.am WindowMaker-0.70.0/src/Makefile.am
162 --- WindowMaker-0.70.0.orig/src/Makefile.am Thu Oct 4 05:39:18 2001
163 +++ WindowMaker-0.70.0/src/Makefile.am Thu Oct 18 16:54:22 2001
168 - $(top_builddir)/WINGs/libWINGs.a\
169 + $(top_builddir)/WINGs/libWINGs.la\
170 $(top_builddir)/wrlib/libwraster.la\
173 diff -Nur WindowMaker-0.70.0.orig/test/Makefile.am WindowMaker-0.70.0/test/Makefile.am
174 --- WindowMaker-0.70.0.orig/test/Makefile.am Sat Oct 2 23:16:11 1999
175 +++ WindowMaker-0.70.0/test/Makefile.am Thu Oct 18 16:54:22 2001
178 wtest_SOURCES = wtest.c
180 -wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@
181 +wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@
184 INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib
185 --- WindowMaker-0.80.0/util/Makefile.am~ Thu Oct 11 11:59:54 2001
186 +++ WindowMaker-0.80.0/util/Makefile.am Thu Jan 3 07:12:53 2002
189 AUTOMAKE_OPTIONS = no-dependencies
191 -pkgdatadir = $(datadir)/@PACKAGE@
193 bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle seticons geticonset wmsetbg wmsetup wmagnify
195 bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wmchlocale wkdemenu.pl\
197 wkdemenu.pl wmchlocale.in wcopy wpaste
199 INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
200 - @HEADER_SEARCH_PATH@ \
201 - -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
202 + $(HEADER_SEARCH_PATH) \
203 + -DETCDIR=\"$(sysconfdir)\" -DDATADIR=\"$(pkgdatadir)\"
205 -liblist= @LIBRARY_SEARCH_PATH@ @INTLIBS@
206 +liblist= $(LIBRARY_SEARCH_PATH) $(INTLIBS)
208 -wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
209 +wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
211 -wdread_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
212 +wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
214 -wxcopy_LDADD = @XLFLAGS@ @XLIBS@
215 +wxcopy_LDADD = $(XLFLAGS) $(XLIBS)
217 -wxpaste_LDADD = @XLFLAGS@ @XLIBS@
218 +wxpaste_LDADD = $(XLFLAGS) $(XLIBS)
220 -getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
221 +getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
224 - $(top_builddir)/WINGs/libWUtil.a \
225 - @XLFLAGS@ @XLIBS@ $(liblist)
226 + $(top_builddir)/WINGs/libWUtil.la \
227 + $(XLFLAGS) $(XLIBS) $(liblist)
229 -seticons_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist)
230 +seticons_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist)
232 -geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist)
233 +geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist)
236 - $(top_builddir)/WINGs/libWINGs.a \
237 + $(top_builddir)/WINGs/libWINGs.la \
238 $(top_builddir)/wrlib/libwraster.la \
239 @XFTLIBS@ @INTLIBS@ @DLLIBS@
242 - $(top_builddir)/WINGs/libWINGs.a \
243 + $(top_builddir)/WINGs/libWINGs.la \
244 $(top_builddir)/wrlib/libwraster.la \
245 @XFTLIBS@ @INTLIBS@ @DLLIBS@
248 - $(top_builddir)/WINGs/libWINGs.a \
249 + $(top_builddir)/WINGs/libWINGs.la \
250 $(top_builddir)/wrlib/libwraster.la \
251 @XFTLIBS@ @INTLIBS@ @DLLIBS@
253 --- WindowMaker-0.70.0.orig/wmlib/Makefile.am Mon Apr 10 02:59:35 2000
254 +++ WindowMaker-0.70.0/wmlib/Makefile.am Thu Oct 18 16:54:22 2001
257 AUTOMAKE_OPTIONS = no-dependencies
259 -lib_LIBRARIES = libWMaker.a
260 +lib_LTLIBRARIES = libWMaker.la
261 +libWMaker_la_LIBADD = $(X_LIBS) -lX11
263 include_HEADERS = WMaker.h
265 INCLUDES = $(DFLAGS) @XCFLAGS@
267 -libWMaker_a_SOURCES = \
268 +libWMaker_la_SOURCES = \
276 +libWMaker_la_LDFLAGS = -version-info 1:1:1
278 DISTCLEANFILES = wmlib.pc