]>
Commit | Line | Data |
---|---|---|
d18efab0 | 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 | |
3 | @@ -2,30 +2,18 @@ | |
cceea408 | 4 | |
d18efab0 | 5 | AUTOMAKE_OPTIONS = no-dependencies |
cceea408 | 6 | |
d18efab0 | 7 | - |
8 | noinst_PROGRAMS = connect server fontl puzzle | |
cceea408 | 9 | |
d18efab0 | 10 | +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ |
11 | + $(INTLIBS) | |
cceea408 | 12 | |
d18efab0 | 13 | -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ |
14 | - @INTLIBS@ | |
15 | - | |
16 | - | |
cceea408 | 17 | -fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a |
d18efab0 | 18 | - |
cceea408 | 19 | -puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a |
d18efab0 | 20 | - |
cceea408 | 21 | -connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a |
d18efab0 | 22 | - |
cceea408 | 23 | -connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \ |
d18efab0 | 24 | - @NETLIBS@ @INTLIBS@ |
25 | - | |
8d088cb2 | 26 | -server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a |
d18efab0 | 27 | - |
28 | -server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \ | |
29 | - @NETLIBS@ @INTLIBS@ | |
30 | +connect_LDADD = $(top_builddir)/WINGs/libWUtil.la $(LIBRARY_SEARCH_PATH) \ | |
31 | + $(NETLIBS) $(INTLIBS) | |
7f2c3a0d | 32 | |
d18efab0 | 33 | +server_LDADD = $(top_builddir)/WINGs/libWUtil.la $(LIBRARY_SEARCH_PATH) \ |
34 | + $(NETLIBS) $(INTLIBS) | |
7f2c3a0d | 35 | |
0abc564d | 36 | INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \ |
d18efab0 | 37 | - -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG |
38 | + -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(HEADER_SEARCH_PATH) -DDEBUG | |
39 | ||
7f2c3a0d | 40 | |
d18efab0 | 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 | |
43 | @@ -2,32 +2,25 @@ | |
7f2c3a0d | 44 | |
d18efab0 | 45 | AUTOMAKE_OPTIONS = no-dependencies |
46 | ||
47 | - | |
48 | - | |
49 | # is this a kluge? if so, how should i do it? | |
50 | includedir = @includedir@/WINGs | |
51 | ||
52 | include_HEADERS = wtableview.h wtabledelegates.h | |
53 | ||
54 | - | |
7f2c3a0d | 55 | -lib_LIBRARIES = libExtraWINGs.a |
56 | +lib_LTLIBRARIES = libExtraWINGs.la | |
57 | ||
58 | noinst_PROGRAMS = test | |
59 | ||
d18efab0 | 60 | -EXTRA_DIST = |
61 | - | |
7f2c3a0d | 62 | -libExtraWINGs_a_SOURCES = \ |
63 | +libExtraWINGs_la_SOURCES = \ | |
64 | wtableview.c \ | |
65 | wtabledelegates.c \ | |
66 | wtableview.h \ | |
d18efab0 | 67 | wtabledelegates.h |
68 | ||
69 | - | |
cceea408 | 70 | INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \ |
d18efab0 | 71 | - -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG |
72 | + -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(HEADER_SEARCH_PATH) | |
32c7aa03 | 73 | |
d18efab0 | 74 | -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ |
75 | - @INTLIBS@ | |
76 | +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ | |
77 | + $(INTLIBS) | |
cceea408 SZ |
78 | |
79 | test_LDADD = wtableview.o wtabledelegates.o $(LDADD) | |
d18efab0 | 80 | - |
0abc564d JB |
81 | --- WindowMaker-0.70.0.orig/WINGs/Makefile.am Thu Oct 4 05:39:17 2001 |
82 | +++ WindowMaker-0.70.0/WINGs/Makefile.am Thu Oct 18 16:54:22 2001 | |
83 | @@ -4,22 +4,18 @@ | |
32c7aa03 | 84 | |
8a5e3c0d | 85 | SUBDIRS = WINGs . po Documentation Resources Examples Extras Tests |
32c7aa03 | 86 | |
d2c9715f | 87 | - |
83b217de | 88 | - |
89 | -#libWINGs_la_LDFLAGS = -version-info 1:1:0 | |
90 | - | |
91 | bin_SCRIPTS = get-wings-flags get-wutil-flags | |
d2c9715f | 92 | |
83b217de | 93 | -lib_LIBRARIES = libWINGs.a libWUtil.a |
0abc564d | 94 | +LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@ |
32c7aa03 | 95 | |
8a5e3c0d | 96 | +lib_LTLIBRARIES = libWINGs.la libWUtil.la |
cceea408 | 97 | |
0abc564d JB |
98 | -LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@ |
99 | ||
100 | ||
260b62b4 | 101 | EXTRA_DIST = BUGS |
32c7aa03 AF |
102 | |
103 | # wbutton.c | |
104 | -libWINGs_a_SOURCES = \ | |
105 | +libWINGs_la_SOURCES = \ | |
260b62b4 | 106 | array.c \ |
d2c9715f | 107 | bagtree.c \ |
108 | configuration.c \ | |
0abc564d | 109 | @@ -80,7 +76,7 @@ |
260b62b4 | 110 | wwindow.c |
5a1d6215 | 111 | |
112 | ||
113 | -libWUtil_a_SOURCES = \ | |
114 | +libWUtil_la_SOURCES = \ | |
260b62b4 | 115 | array.c \ |
d2c9715f | 116 | bagtree.c \ |
117 | connection.c \ | |
d18efab0 | 118 | --- WindowMaker-0.80.0/WINGs/Tests/Makefile.am.orig Thu Oct 11 11:59:54 2001 |
119 | +++ WindowMaker-0.80.0/WINGs/Tests/Makefile.am Thu Jan 3 06:14:31 2002 | |
120 | @@ -4,18 +4,14 @@ | |
cceea408 | 121 | |
0abc564d | 122 | noinst_PROGRAMS = wtest wmquery wmfile testmywidget |
cceea408 | 123 | |
d18efab0 | 124 | -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ |
125 | - @INTLIBS@ | |
126 | - | |
127 | +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ | |
128 | + $(INTLIBS) | |
cceea408 SZ |
129 | |
130 | testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h | |
131 | ||
132 | -wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a | |
d18efab0 | 133 | - |
134 | - | |
135 | EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png | |
136 | ||
137 | INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \ | |
138 | - -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG | |
139 | + -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(HEADER_SEARCH_PATH) | |
cceea408 SZ |
140 | |
141 | ||
0abc564d JB |
142 | --- WindowMaker-0.70.0.orig/WPrefs.app/Makefile.am Thu Oct 4 05:39:18 2001 |
143 | +++ WindowMaker-0.70.0/WPrefs.app/Makefile.am Thu Oct 18 16:54:22 2001 | |
260b62b4 | 144 | @@ -46,10 +46,10 @@ |
145 | ||
146 | INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ | |
147 | ||
148 | -WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a | |
149 | +WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la | |
150 | ||
151 | WPrefs_LDADD = \ | |
152 | - $(top_builddir)/WINGs/libWINGs.a\ | |
153 | + $(top_builddir)/WINGs/libWINGs.la\ | |
154 | $(top_builddir)/wrlib/libwraster.la \ | |
260b62b4 | 155 | @INTLIBS@ |
0abc564d JB |
156 | |
157 | diff -Nur WindowMaker-0.70.0.orig/src/Makefile.am WindowMaker-0.70.0/src/Makefile.am | |
158 | --- WindowMaker-0.70.0.orig/src/Makefile.am Thu Oct 4 05:39:18 2001 | |
159 | +++ WindowMaker-0.70.0/src/Makefile.am Thu Oct 18 16:54:22 2001 | |
160 | @@ -111,7 +111,7 @@ | |
32c7aa03 AF |
161 | |
162 | ||
163 | wmaker_LDADD = \ | |
164 | - $(top_builddir)/WINGs/libWINGs.a\ | |
165 | + $(top_builddir)/WINGs/libWINGs.la\ | |
166 | $(top_builddir)/wrlib/libwraster.la\ | |
260b62b4 | 167 | @XLIBS@ \ |
0abc564d JB |
168 | @INTLIBS@ \ |
169 | diff -Nur WindowMaker-0.70.0.orig/test/Makefile.am WindowMaker-0.70.0/test/Makefile.am | |
170 | --- WindowMaker-0.70.0.orig/test/Makefile.am Sat Oct 2 23:16:11 1999 | |
171 | +++ WindowMaker-0.70.0/test/Makefile.am Thu Oct 18 16:54:22 2001 | |
32c7aa03 AF |
172 | @@ -8,7 +8,7 @@ |
173 | ||
174 | wtest_SOURCES = wtest.c | |
175 | ||
176 | -wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@ | |
177 | +wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@ | |
178 | ||
179 | ||
180 | INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib | |
d18efab0 | 181 | --- WindowMaker-0.80.0/util/Makefile.am~ Thu Oct 11 11:59:54 2001 |
182 | +++ WindowMaker-0.80.0/util/Makefile.am Thu Jan 3 07:12:53 2002 | |
183 | @@ -1,8 +1,6 @@ | |
184 | ||
185 | AUTOMAKE_OPTIONS = no-dependencies | |
186 | ||
187 | -pkgdatadir = $(datadir)/@PACKAGE@ | |
188 | - | |
189 | bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle seticons geticonset wmsetbg wmsetup wmagnify | |
190 | ||
191 | bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wmchlocale wkdemenu.pl\ | |
192 | @@ -12,44 +10,44 @@ | |
193 | wkdemenu.pl wmchlocale.in wcopy wpaste | |
194 | ||
195 | INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \ | |
196 | - @HEADER_SEARCH_PATH@ \ | |
197 | - -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\" | |
198 | + $(HEADER_SEARCH_PATH) \ | |
199 | + -DETCDIR=\"$(sysconfdir)\" -DDATADIR=\"$(pkgdatadir)\" | |
200 | ||
201 | # X_EXTRA_LIBS is for libproplist in systems that need -lsocket | |
202 | # remove after we require lPL 0.10.2 which automatically resolves its | |
0abc564d | 203 | # library dependancies using the libPropList.la file |
d18efab0 | 204 | -liblist= @LIBRARY_SEARCH_PATH@ @X_EXTRA_LIBS@ @INTLIBS@ |
205 | +liblist= $(LIBRARY_SEARCH_PATH) $(X_EXTRA_LIBS) $(INTLIBS) | |
0abc564d JB |
206 | |
207 | -wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) | |
208 | +wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) | |
209 | ||
210 | -wdread_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) | |
211 | +wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) | |
212 | ||
d18efab0 | 213 | -wxcopy_LDADD = @XLFLAGS@ @XLIBS@ |
214 | +wxcopy_LDADD = $(XLFLAGS) $(XLIBS) | |
0abc564d | 215 | |
d18efab0 | 216 | -wxpaste_LDADD = @XLFLAGS@ @XLIBS@ |
217 | +wxpaste_LDADD = $(XLFLAGS) $(XLIBS) | |
0abc564d JB |
218 | |
219 | -getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) | |
220 | +getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) | |
221 | ||
222 | setstyle_LDADD = \ | |
223 | - $(top_builddir)/WINGs/libWUtil.a \ | |
d18efab0 | 224 | - @XLFLAGS@ @XLIBS@ $(liblist) |
0abc564d | 225 | + $(top_builddir)/WINGs/libWUtil.la \ |
d18efab0 | 226 | + $(XLFLAGS) $(XLIBS) $(liblist) |
0abc564d JB |
227 | |
228 | -seticons_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist) | |
229 | +seticons_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist) | |
230 | ||
231 | -geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist) | |
232 | +geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist) | |
d2c9715f | 233 | |
234 | wmagnify_LDADD = \ | |
235 | - $(top_builddir)/WINGs/libWINGs.a \ | |
236 | + $(top_builddir)/WINGs/libWINGs.la \ | |
237 | $(top_builddir)/wrlib/libwraster.la \ | |
d18efab0 | 238 | @INTLIBS@ @DLLIBS@ |
d2c9715f | 239 | |
240 | wmsetup_LDADD = \ | |
241 | - $(top_builddir)/WINGs/libWINGs.a \ | |
242 | + $(top_builddir)/WINGs/libWINGs.la \ | |
243 | $(top_builddir)/wrlib/libwraster.la \ | |
d18efab0 | 244 | @INTLIBS@ @DLLIBS@ |
5a1d6215 | 245 | |
246 | wmsetbg_LDADD = \ | |
247 | - $(top_builddir)/WINGs/libWINGs.a \ | |
248 | + $(top_builddir)/WINGs/libWINGs.la \ | |
249 | $(top_builddir)/wrlib/libwraster.la \ | |
d18efab0 | 250 | @INTLIBS@ @DLLIBS@ |
0abc564d | 251 | |
0abc564d JB |
252 | --- WindowMaker-0.70.0.orig/wmlib/Makefile.am Mon Apr 10 02:59:35 2000 |
253 | +++ WindowMaker-0.70.0/wmlib/Makefile.am Thu Oct 18 16:54:22 2001 | |
32c7aa03 AF |
254 | @@ -1,13 +1,13 @@ |
255 | ||
256 | AUTOMAKE_OPTIONS = no-dependencies | |
257 | ||
258 | -lib_LIBRARIES = libWMaker.a | |
cceea408 | 259 | +lib_LTLIBRARIES = libWMaker.la |
32c7aa03 AF |
260 | |
261 | include_HEADERS = WMaker.h | |
262 | ||
260b62b4 | 263 | INCLUDES = $(DFLAGS) @XCFLAGS@ |
32c7aa03 AF |
264 | |
265 | -libWMaker_a_SOURCES = \ | |
266 | +libWMaker_la_SOURCES = \ | |
267 | menu.c \ | |
268 | app.c \ | |
269 | event.c \ | |
270 | @@ -15,3 +15,4 @@ | |
271 | app.h \ | |
272 | menu.h | |
273 | ||
274 | +libWMaker_la_LDFLAGS = -version-info 1:1:1 |