]>
Commit | Line | Data |
---|---|---|
8456ab72 JR |
1 | diff -ruN libwmf/Makefile.in libwmf.shared/Makefile.in |
2 | --- libwmf/Makefile.in Sat Jun 2 22:22:33 2001 | |
3 | +++ libwmf.shared/Makefile.in Sat Jun 2 22:21:35 2001 | |
4 | @@ -8,7 +8,7 @@ | |
0a546926 JB |
5 | |
6 | DOGD = @GD_LIBS@ | |
7 | ||
8 | -LDFLAGS = -L. @LDFLAGS@ | |
9 | +LDFLAGS = @LDFLAGS@ | |
10 | ||
11 | CC = @CC@ | |
12 | ||
7a9d2139 | 13 | @@ -39,60 +39,55 @@ |
8135e087 JB |
14 | .SUFFIXES: .C .o |
15 | ||
16 | WMFLIBOBJECTS = \ | |
17 | - wmfapi.o \ | |
18 | - stack.o \ | |
19 | - bytelevel.o | |
20 | + wmfapi.lo \ | |
21 | + stack.lo \ | |
22 | + bytelevel.lo | |
23 | ||
24 | GDLIBOBJECTS = \ | |
25 | - gdwmfapi.o \ | |
26 | - wmftt.o | |
27 | + gdwmfapi.lo \ | |
28 | + wmftt.lo | |
29 | ||
30 | XFLIBOBJECTS = \ | |
31 | - xfwmfapi.o | |
f6441b7e AM |
32 | + xfwmfapi.lo |
33 | ||
34 | EPSLIBOBJECTS = \ | |
35 | - xfwmfapi.o | |
8135e087 JB |
36 | + xfwmfapi.lo |
37 | ||
38 | XLIBOBJECTS = \ | |
39 | - Xwmfapi.o \ | |
40 | - Xtext.o \ | |
41 | - rotated.o | |
42 | + Xwmfapi.lo \ | |
43 | + Xtext.lo \ | |
44 | + rotated.lo | |
45 | ||
f6441b7e | 46 | TARGETS = wmftopng wmftofig wmftoeps xwmf |
8135e087 | 47 | |
0a546926 JB |
48 | all: $(TARGETS) |
49 | ||
50 | xwmf: libwmf.a libXwmf.a xwmf.o LIBDIB | |
51 | - $(CC) $(LDFLAGS) -o xwmf xwmf.o -L. -lXwmf -lwmf $(LIBS) | |
8456ab72 | 52 | + $(CC) $(LDFLAGS) -o xwmf xwmf.o -L./.libs -lXwmf -lwmf -L./libdib/.libs $(LIBS) |
0a546926 JB |
53 | |
54 | wmftopng: libwmf.a libgdwmf.a wmftopng.o LIBXGD LIBDIB | |
55 | - $(CC) $(LDFLAGS) -o wmftopng wmftopng.o -L. -lgdwmf -lwmf $(GDLIBS) | |
8456ab72 | 56 | + $(CC) $(LDFLAGS) -o wmftopng wmftopng.o -L./.libs -lgdwmf -lwmf -L./libdib/.libs -Lxgd-1.7.3/.libs $(GDLIBS) |
0a546926 JB |
57 | |
58 | wmftofig: libwmf.a libxfwmf.a wmftofig.o LIBXFIG | |
59 | - $(CC) $(LDFLAGS) -o wmftofig wmftofig.o -L. -lxfwmf -lwmf $(XFLIBS) | |
8456ab72 | 60 | + $(CC) $(LDFLAGS) -o wmftofig wmftofig.o -L./.libs -lxfwmf -lwmf -L./libdib/.libs -L./libxfig/.libs $(XFLIBS) |
8135e087 | 61 | |
0a546926 JB |
62 | wmftoeps: libwmf.a libepswmf.a wmftoeps.o LIBXFIG |
63 | - $(CC) $(LDFLAGS) -o wmftoeps wmftoeps.o -L. -lepswmf -lwmf $(EPSLIBS) | |
8456ab72 | 64 | + $(CC) $(LDFLAGS) -o wmftoeps wmftoeps.o -L./.libs -lepswmf -lwmf -L./libdib/.libs -L./libxfig/.libs $(EPSLIBS) |
0a546926 JB |
65 | |
66 | -libwmf.a: $(WMFLIBOBJECTS) | |
8135e087 JB |
67 | - $(AR) rc libwmf.a $(WMFLIBOBJECTS) |
68 | - $(RANLIB) libwmf.a | |
0a546926 JB |
69 | - |
70 | -libgdwmf.a: $(GDLIBOBJECTS) | |
8135e087 JB |
71 | - $(AR) rc libgdwmf.a $(GDLIBOBJECTS) |
72 | - $(RANLIB) libgdwmf.a | |
0a546926 JB |
73 | - |
74 | -libxfwmf.a: $(XFLIBOBJECTS) | |
8135e087 JB |
75 | - $(AR) rc libxfwmf.a $(XFLIBOBJECTS) |
76 | - $(RANLIB) libxfwmf.a | |
0a546926 JB |
77 | - |
78 | -libepswmf.a: $(EPSLIBOBJECTS) | |
f6441b7e AM |
79 | - $(AR) rc libepswmf.a $(EPSLIBOBJECTS) |
80 | - $(RANLIB) libepswmf.a | |
0a546926 JB |
81 | - |
82 | -libXwmf.a: $(XLIBOBJECTS) | |
8135e087 JB |
83 | - $(AR) rc libXwmf.a $(XLIBOBJECTS) |
84 | - $(RANLIB) libXwmf.a | |
7a9d2139 | 85 | +libwmf.a: $(WMFLIBOBJECTS) LIBDIB |
8456ab72 | 86 | + libtool --mode=link $(CC) $(LDFLAGS) -o libwmf.la $(WMFLIBOBJECTS) $(LIBS) -rpath @libdir@ |
7a9d2139 JB |
87 | + |
88 | +libgdwmf.a: $(GDLIBOBJECTS) LIBDIB LIBXGD libwmf.a | |
8456ab72 | 89 | + libtool --mode=link $(CC) $(LDFLAGS) -o libgdwmf.la $(GDLIBOBJECTS) -L./ -lwmf $(GDLIBS) -rpath @libdir@ |
7a9d2139 JB |
90 | + |
91 | +libxfwmf.a: $(XFLIBOBJECTS) LIBDIB LIBXFIG libwmf.a | |
8456ab72 | 92 | + libtool --mode=link $(CC) $(LDFLAGS) -o libxfwmf.la $(XFLIBOBJECTS) -L./ -lwmf $(XFLIBS) -rpath @libdir@ |
0a546926 | 93 | + |
7a9d2139 | 94 | +libepswmf.a: $(EPSLIBOBJECTS) LIBDIB LIBXFIG libwmf.a |
8456ab72 | 95 | + libtool --mode=link $(CC) $(LDFLAGS) -o libepswmf.la $(EPSLIBOBJECTS) -L./ -lwmf $(EPSLIBS) -rpath @libdir@ |
0a546926 | 96 | + |
7a9d2139 | 97 | +libXwmf.a: $(XLIBOBJECTS) LIBDIB libwmf.a |
8456ab72 | 98 | + libtool --mode=link $(CC) $(LDFLAGS) -o libXwmf.la $(XLIBOBJECTS) -L./ -lwmf $(LIBS) -rpath @libdir@ |
8135e087 JB |
99 | |
100 | LIBDIB: | |
101 | @echo making libdib in libdib | |
7a9d2139 | 102 | @@ -109,8 +104,11 @@ |
8135e087 JB |
103 | %.o: %.c |
104 | $(CC) $(CFLAGS) -c $*.c | |
8135e087 | 105 | |
f6441b7e AM |
106 | +%.lo: %.c |
107 | + libtool $(CC) $(CFLAGS) -c $*.c | |
108 | + | |
8135e087 | 109 | clean: cleansub |
f6441b7e | 110 | - rm -rf *.o wmftopng wmftofig wmftoeps xwmf a.out core *.a .pure |
8135e087 JB |
111 | + rm -rf *.o wmftopng wmftofig xwmf a.out core *.a *.la *.so* *.lo .pure |
112 | ||
113 | cleansub: | |
114 | @echo cleaning libdib in libdib | |
7a9d2139 | 115 | @@ -131,7 +129,7 @@ |
8135e087 JB |
116 | distclean: realclean |
117 | ||
118 | realclean: realcleansub | |
f6441b7e | 119 | - rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o wmftopng wmftofig wmftoeps xwmf a.out *.a core .pure |
8135e087 JB |
120 | + rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o wmftopng wmftofig xwmf a.out *.a *.la *.lo *.so* core .pure |
121 | ||
122 | realcleansub: | |
123 | @echo cleaning libdib in libdib | |
8456ab72 JR |
124 | @@ -145,16 +143,16 @@ |
125 | $(MKINSTALLDIRS) $(DESTDIR)$(bindir) \ | |
126 | $(DESTDIR)$(libdir) | |
127 | ||
128 | -install: all installdirs installsub | |
129 | +install: installdirs installsub | |
130 | $(INSTALL) $(srcdir)/xwmf $(DESTDIR)$(bindir)/xwmf | |
0a546926 JB |
131 | $(INSTALL) $(srcdir)/wmftopng $(DESTDIR)$(bindir)/wmftopng |
132 | $(INSTALL) $(srcdir)/wmftofig $(DESTDIR)$(bindir)/wmftofig | |
133 | $(INSTALL) $(srcdir)/wmftoeps $(DESTDIR)$(bindir)/wmftoeps | |
134 | - $(INSTALL_DATA) $(srcdir)/libwmf.a $(DESTDIR)$(libdir)/libwmf.a | |
135 | - $(INSTALL_DATA) $(srcdir)/libgdwmf.a $(DESTDIR)$(libdir)/libgdwmf.a | |
136 | - $(INSTALL_DATA) $(srcdir)/libXwmf.a $(DESTDIR)$(libdir)/libXwmf.a | |
137 | - $(INSTALL_DATA) $(srcdir)/libxfwmf.a $(DESTDIR)$(libdir)/libxfwmf.a | |
138 | - $(INSTALL_DATA) $(srcdir)/libepswmf.a $(DESTDIR)$(libdir)/libepswmf.a | |
139 | + libtool $(INSTALL_DATA) $(srcdir)/libwmf.la $(DESTDIR)$(libdir)/libwmf.la | |
0a546926 | 140 | + libtool $(INSTALL_DATA) $(srcdir)/libgdwmf.la $(DESTDIR)$(libdir)/libgdwmf.la |
0a546926 | 141 | + libtool $(INSTALL_DATA) $(srcdir)/libXwmf.la $(DESTDIR)$(libdir)/libXwmf.la |
0a546926 | 142 | + libtool $(INSTALL_DATA) $(srcdir)/libxfwmf.la $(DESTDIR)$(libdir)/libxfwmf.la |
0a546926 | 143 | + libtool $(INSTALL_DATA) $(srcdir)/libepswmf.la $(DESTDIR)$(libdir)/libepswmf.la |
8135e087 JB |
144 | $(INSTALL_DATA) wmfapi.h $(DESTDIR)$(INCLUDEDIR)/wmfapi.h |
145 | $(INSTALL_DATA) gdwmfapi.h $(DESTDIR)$(INCLUDEDIR)/gdwmfapi.h | |
146 | $(INSTALL_DATA) Xwmfapi.h $(DESTDIR)$(INCLUDEDIR)/Xwmfapi.h | |
8456ab72 JR |
147 | diff -ruN libwmf/libdib/Makefile.in libwmf.shared/libdib/Makefile.in |
148 | --- libwmf/libdib/Makefile.in Sat Jun 2 22:22:33 2001 | |
149 | +++ libwmf.shared/libdib/Makefile.in Sat Jun 2 22:21:46 2001 | |
0a546926 JB |
150 | @@ -1,6 +1,6 @@ |
151 | LIBS = @LIBS@ | |
152 | ||
153 | -LDFLAGS = @LDFLAGS@ -L. | |
154 | +LDFLAGS = @LDFLAGS@ | |
155 | ||
156 | CC = @CC@ | |
157 | ||
158 | @@ -31,24 +31,26 @@ | |
8135e087 JB |
159 | .SUFFIXES: .C .o |
160 | ||
161 | MYOBJECTS = \ | |
f6441b7e | 162 | - ../bytelevel.o \ |
8135e087 JB |
163 | - bintree.o \ |
164 | - dibtoxpm.o | |
f6441b7e | 165 | + ../bytelevel.lo \ |
8135e087 JB |
166 | + bintree.lo \ |
167 | + dibtoxpm.lo | |
168 | ||
169 | all: libdib.a test_dibtoxpm | |
170 | ||
171 | libdib.a: $(MYOBJECTS) | |
172 | - $(AR) rc libdib.a $(MYOBJECTS) | |
173 | - $(RANLIB) libdib.a | |
8456ab72 | 174 | + libtool --mode=link $(CC) $(LDFLAGS) -o libdib.la $(MYOBJECTS) -rpath @libdir@ |
8135e087 JB |
175 | |
176 | test_dibtoxpm: libdib.a test_dibtoxpm.o | |
0a546926 JB |
177 | - $(CC) $(LDFLAGS) -o test_dibtoxpm test_dibtoxpm.o -ldib |
178 | + $(CC) $(LDFLAGS) -o test_dibtoxpm test_dibtoxpm.o -L./.libs -ldib | |
179 | ||
8135e087 JB |
180 | %.o: %.c |
181 | $(CC) $(CFLAGS) -c $*.c | |
f6441b7e | 182 | |
8135e087 JB |
183 | +%.lo: %.c |
184 | + libtool $(CC) $(CFLAGS) -c $*.c | |
f6441b7e | 185 | + |
8135e087 JB |
186 | clean: |
187 | - rm -rf *.o *.a test_dibtoxpm a.out core | |
188 | + rm -rf *.o *.a *.lo *.la *.so test_dibtoxpm a.out core | |
189 | ||
190 | realclean: | |
191 | rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o *.a test_dibtoxpm core | |
8456ab72 JR |
192 | @@ -57,9 +59,8 @@ |
193 | $(MKINSTALLDIRS) $(DESTDIR)@libdir@ \ | |
194 | $(DESTDIR)$(INCLUDEDIR) | |
0a546926 | 195 | |
8456ab72 JR |
196 | -install: all installdirs |
197 | +install: installdirs | |
8135e087 | 198 | $(INSTALL_DATA) dibtoxpm.h $(DESTDIR)$(INCLUDEDIR)/dibtoxpm.h |
0a546926 | 199 | - $(INSTALL_DATA) libdib.a $(DESTDIR)@libdir@/libdib.a |
8135e087 | 200 | - |
0a546926 | 201 | + libtool $(INSTALL_DATA) libdib.la $(DESTDIR)@libdir@/libdib.la |
8135e087 JB |
202 | |
203 | # DO NOT DELETE THIS LINE -- make depend depends on it. | |
8456ab72 JR |
204 | diff -ruN libwmf/libsvg/Makefile.in libwmf.shared/libsvg/Makefile.in |
205 | --- libwmf/libsvg/Makefile.in Sat Jun 2 22:22:33 2001 | |
206 | +++ libwmf.shared/libsvg/Makefile.in Sat Jun 2 22:21:54 2001 | |
207 | @@ -50,7 +50,7 @@ | |
208 | realclean: | |
209 | rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o *.a core | |
210 | ||
211 | -install: all installdirs | |
212 | +install: installdirs | |
213 | $(INSTALL_DATA) libsvg.a $(DESTDIR)@libdir@/libsvg.a | |
214 | ||
215 | installdirs: | |
216 | diff -ruN libwmf/libxfig/Makefile.in libwmf.shared/libxfig/Makefile.in | |
217 | --- libwmf/libxfig/Makefile.in Sat Jun 2 22:22:33 2001 | |
218 | +++ libwmf.shared/libxfig/Makefile.in Sat Jun 2 22:22:00 2001 | |
0a546926 JB |
219 | @@ -1,6 +1,6 @@ |
220 | LIBS = @LIBS@ | |
221 | ||
222 | -LDFLAGS = @LDFLAGS@ -L. | |
223 | +LDFLAGS = @LDFLAGS@ | |
224 | ||
225 | CC = @CC@ | |
226 | ||
227 | @@ -31,38 +31,39 @@ | |
8135e087 JB |
228 | .SUFFIXES: .C .o |
229 | ||
f6441b7e | 230 | XFOBJECTS = \ |
8135e087 JB |
231 | - color.o \ |
232 | - objlist.o \ | |
233 | - fileops.o | |
234 | + color.lo \ | |
235 | + objlist.lo \ | |
236 | + fileops.lo | |
237 | ||
f6441b7e AM |
238 | EPSOBJECTS = \ |
239 | - color.o \ | |
240 | - objlist.o \ | |
241 | - epsfileops.o | |
242 | + color.lo \ | |
243 | + objlist.lo \ | |
244 | + epsfileops.lo | |
245 | ||
246 | ||
247 | all: libxfig.a libeps.a | |
8135e087 | 248 | |
f6441b7e AM |
249 | libxfig.a: $(XFOBJECTS) |
250 | - $(AR) rc libxfig.a $(XFOBJECTS) | |
8135e087 | 251 | - $(RANLIB) libxfig.a |
8456ab72 | 252 | + libtool --mode=link $(CC) $(LDFLAGS) -o libxfig.la $(XFOBJECTS) -rpath @libdir@ |
8135e087 | 253 | |
f6441b7e AM |
254 | libeps.a: $(EPSOBJECTS) |
255 | - $(AR) rc libeps.a $(EPSOBJECTS) | |
256 | - $(RANLIB) libeps.a | |
8456ab72 | 257 | + libtool --mode=link $(CC) $(LDFLAGS) -o libeps.la $(EPSOBJECTS) -rpath @libdir@ |
f6441b7e | 258 | |
8135e087 JB |
259 | %.o: %.c |
260 | $(CC) $(CFLAGS) -c $*.c | |
f6441b7e | 261 | |
8135e087 JB |
262 | +%.lo: %.c |
263 | + libtool $(CC) $(CFLAGS) -c $*.c | |
f6441b7e | 264 | + |
8135e087 JB |
265 | clean: |
266 | - rm -rf *.o *.a core | |
267 | + rm -rf *.o *.a *.la *.lo *.so* core | |
268 | ||
269 | -realclean: | |
270 | - rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o *.a core | |
271 | +realclean: clean | |
272 | + rm -rf config.cache config.status config.log Makefile config.h lex.yy.c | |
273 | ||
8456ab72 | 274 | -install: all installdirs |
0a546926 JB |
275 | - $(INSTALL_DATA) libxfig.a $(DESTDIR)@libdir@/libxfig.a |
276 | - $(INSTALL_DATA) libeps.a $(DESTDIR)@libdir@/libeps.a | |
8456ab72 | 277 | +install: installdirs |
0a546926 JB |
278 | + libtool $(INSTALL_DATA) libxfig.la $(DESTDIR)@libdir@/libxfig.la |
279 | + libtool $(INSTALL_DATA) libeps.la $(DESTDIR)@libdir@/libeps.la | |
8135e087 JB |
280 | |
281 | installdirs: | |
282 | $(MKINSTALLDIRS) $(DESTDIR)@libdir@ \ | |
8456ab72 JR |
283 | diff -ruN libwmf/xgd-1.7.3/Makefile.in libwmf.shared/xgd-1.7.3/Makefile.in |
284 | --- libwmf/xgd-1.7.3/Makefile.in Sat Jun 2 22:22:33 2001 | |
285 | +++ libwmf.shared/xgd-1.7.3/Makefile.in Sat Jun 2 22:22:09 2001 | |
0a546926 JB |
286 | @@ -53,7 +53,8 @@ |
287 | #-L. as this allows the gd library itself to be found. | |
288 | #Put -L. first so that old versions of the gd library elsewhere | |
289 | #on your system can't cause conflicts while building a new one. | |
290 | -LIBDIRS=-L. @LDFLAGS@ | |
291 | +LDFLAGS=@LDFLAGS@ | |
292 | +LIBDIRS=-L./.libs $(LDFLAGS) | |
293 | ||
294 | #Location where libxgd.a should be installed by "make install". | |
295 | INSTALL_LIB=@libdir@ | |
296 | @@ -80,10 +81,15 @@ | |
8135e087 JB |
297 | BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng |
298 | TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf | |
299 | ||
300 | +%.o: %.c | |
301 | + $(CC) $(CFLAGS) -c $*.c | |
302 | +%.lo: %.c | |
303 | + libtool $(CC) $(CFLAGS) -c $*.c | |
304 | + | |
305 | all: libxgd.a $(PROGRAMS) | |
306 | ||
8456ab72 | 307 | -install: libxgd.a $(BIN_PROGRAMS) |
0a546926 | 308 | - $(INSTALL) libxgd.a $(DESTDIR)$(INSTALL_LIB)/libxgd.a |
8456ab72 | 309 | +install: |
0a546926 | 310 | + libtool $(INSTALL) libxgd.la $(DESTDIR)$(INSTALL_LIB)/libxgd.la |
f6441b7e AM |
311 | $(INSTALL) pngtogd $(DESTDIR)$(INSTALL_BIN)/pngtogd |
312 | $(INSTALL) pngtogd2 $(DESTDIR)$(INSTALL_BIN)/pngtogd2 | |
313 | $(INSTALL) gdtopng $(DESTDIR)$(INSTALL_BIN)/gdtopng | |
0a546926 | 314 | @@ -134,19 +140,17 @@ |
8135e087 JB |
315 | gdtestttf: gdtestttf.o libxgd.a |
316 | $(CC) gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS) | |
317 | ||
318 | -libxgd.a: gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \ | |
319 | - gd_io_ss.o gd_png.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \ | |
320 | - gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o \ | |
321 | - gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h | |
0a546926 JB |
322 | - rm -f libxgd.a |
323 | - $(AR) rc libxgd.a gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o \ | |
324 | - gd_io_file.o gd_ss.o gd_io_ss.o gd_png.o gdxpm.o \ | |
325 | - gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \ | |
326 | - gdtables.o gdttf.o gdcache.o gdkanji.o | |
327 | - -@RANLIB@ libxgd.a | |
f6441b7e | 328 | + |
8135e087 JB |
329 | +XGDOBJECTS = \ |
330 | + gd.lo gd_gd.lo gd_gd2.lo gd_io.lo gd_io_dp.lo gd_io_file.lo gd_ss.lo \ | |
331 | + gd_io_ss.lo gd_png.lo gdxpm.lo gdfontt.lo gdfonts.lo gdfontmb.lo gdfontl.lo \ | |
332 | + gdfontg.lo gdtables.lo gdttf.lo gdcache.lo gdkanji.lo | |
f6441b7e | 333 | + |
8135e087 | 334 | +libxgd.a: $(XGDOBJECTS) gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h |
8456ab72 | 335 | + libtool --mode=link $(CC) -lm -lpng -lz -lttf $(LDFLAGS) -o libxgd.la $(XGDOBJECTS) -rpath @libdir@ |
8135e087 JB |
336 | |
337 | clean: | |
f6441b7e | 338 | - rm -f *.o *.a ${PROGRAMS} core |
8135e087 JB |
339 | + rm -f *.o *.a *.la *.lo *.so* ${PROGRAMS} |
340 | ||
f6441b7e AM |
341 | realclean: |
342 | rm -f *.o *.a ${PROGRAMS} core Makefile |