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