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
8 -LDFLAGS = -L. @LDFLAGS@
46 TARGETS = wmftopng wmftofig wmftoeps xwmf
50 xwmf: libwmf.a libXwmf.a xwmf.o LIBDIB
51 - $(CC) $(LDFLAGS) -o xwmf xwmf.o -L. -lXwmf -lwmf $(LIBS)
52 + $(CC) $(LDFLAGS) -o xwmf xwmf.o -L./.libs -lXwmf -lwmf -L./libdib/.libs $(LIBS)
54 wmftopng: libwmf.a libgdwmf.a wmftopng.o LIBXGD LIBDIB
55 - $(CC) $(LDFLAGS) -o wmftopng wmftopng.o -L. -lgdwmf -lwmf $(GDLIBS)
56 + $(CC) $(LDFLAGS) -o wmftopng wmftopng.o -L./.libs -lgdwmf -lwmf -L./libdib/.libs -Lxgd-1.7.3/.libs $(GDLIBS)
58 wmftofig: libwmf.a libxfwmf.a wmftofig.o LIBXFIG
59 - $(CC) $(LDFLAGS) -o wmftofig wmftofig.o -L. -lxfwmf -lwmf $(XFLIBS)
60 + $(CC) $(LDFLAGS) -o wmftofig wmftofig.o -L./.libs -lxfwmf -lwmf -L./libdib/.libs -L./libxfig/.libs $(XFLIBS)
62 wmftoeps: libwmf.a libepswmf.a wmftoeps.o LIBXFIG
63 - $(CC) $(LDFLAGS) -o wmftoeps wmftoeps.o -L. -lepswmf -lwmf $(EPSLIBS)
64 + $(CC) $(LDFLAGS) -o wmftoeps wmftoeps.o -L./.libs -lepswmf -lwmf -L./libdib/.libs -L./libxfig/.libs $(EPSLIBS)
66 -libwmf.a: $(WMFLIBOBJECTS)
67 - $(AR) rc libwmf.a $(WMFLIBOBJECTS)
70 -libgdwmf.a: $(GDLIBOBJECTS)
71 - $(AR) rc libgdwmf.a $(GDLIBOBJECTS)
72 - $(RANLIB) libgdwmf.a
74 -libxfwmf.a: $(XFLIBOBJECTS)
75 - $(AR) rc libxfwmf.a $(XFLIBOBJECTS)
76 - $(RANLIB) libxfwmf.a
78 -libepswmf.a: $(EPSLIBOBJECTS)
79 - $(AR) rc libepswmf.a $(EPSLIBOBJECTS)
80 - $(RANLIB) libepswmf.a
82 -libXwmf.a: $(XLIBOBJECTS)
83 - $(AR) rc libXwmf.a $(XLIBOBJECTS)
85 +libwmf.a: $(WMFLIBOBJECTS) LIBDIB
86 + libtool --mode=link $(CC) $(LDFLAGS) -o libwmf.la $(WMFLIBOBJECTS) $(LIBS) -rpath @libdir@
88 +libgdwmf.a: $(GDLIBOBJECTS) LIBDIB LIBXGD libwmf.a
89 + libtool --mode=link $(CC) $(LDFLAGS) -o libgdwmf.la $(GDLIBOBJECTS) -L./ -lwmf $(GDLIBS) -rpath @libdir@
91 +libxfwmf.a: $(XFLIBOBJECTS) LIBDIB LIBXFIG libwmf.a
92 + libtool --mode=link $(CC) $(LDFLAGS) -o libxfwmf.la $(XFLIBOBJECTS) -L./ -lwmf $(XFLIBS) -rpath @libdir@
94 +libepswmf.a: $(EPSLIBOBJECTS) LIBDIB LIBXFIG libwmf.a
95 + libtool --mode=link $(CC) $(LDFLAGS) -o libepswmf.la $(EPSLIBOBJECTS) -L./ -lwmf $(EPSLIBS) -rpath @libdir@
97 +libXwmf.a: $(XLIBOBJECTS) LIBDIB libwmf.a
98 + libtool --mode=link $(CC) $(LDFLAGS) -o libXwmf.la $(XLIBOBJECTS) -L./ -lwmf $(LIBS) -rpath @libdir@
101 @echo making libdib in libdib
104 $(CC) $(CFLAGS) -c $*.c
107 + libtool $(CC) $(CFLAGS) -c $*.c
110 - rm -rf *.o wmftopng wmftofig wmftoeps xwmf a.out core *.a .pure
111 + rm -rf *.o wmftopng wmftofig xwmf a.out core *.a *.la *.so* *.lo .pure
114 @echo cleaning libdib in libdib
118 realclean: realcleansub
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
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
123 @echo cleaning libdib in libdib
124 @@ -145,16 +143,16 @@
125 $(MKINSTALLDIRS) $(DESTDIR)$(bindir) \
128 -install: all installdirs installsub
129 +install: installdirs installsub
130 $(INSTALL) $(srcdir)/xwmf $(DESTDIR)$(bindir)/xwmf
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
140 + libtool $(INSTALL_DATA) $(srcdir)/libgdwmf.la $(DESTDIR)$(libdir)/libgdwmf.la
141 + libtool $(INSTALL_DATA) $(srcdir)/libXwmf.la $(DESTDIR)$(libdir)/libXwmf.la
142 + libtool $(INSTALL_DATA) $(srcdir)/libxfwmf.la $(DESTDIR)$(libdir)/libxfwmf.la
143 + libtool $(INSTALL_DATA) $(srcdir)/libepswmf.la $(DESTDIR)$(libdir)/libepswmf.la
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
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
153 -LDFLAGS = @LDFLAGS@ -L.
169 all: libdib.a test_dibtoxpm
171 libdib.a: $(MYOBJECTS)
172 - $(AR) rc libdib.a $(MYOBJECTS)
174 + libtool --mode=link $(CC) $(LDFLAGS) -o libdib.la $(MYOBJECTS) -rpath @libdir@
176 test_dibtoxpm: libdib.a test_dibtoxpm.o
177 - $(CC) $(LDFLAGS) -o test_dibtoxpm test_dibtoxpm.o -ldib
178 + $(CC) $(LDFLAGS) -o test_dibtoxpm test_dibtoxpm.o -L./.libs -ldib
181 $(CC) $(CFLAGS) -c $*.c
184 + libtool $(CC) $(CFLAGS) -c $*.c
187 - rm -rf *.o *.a test_dibtoxpm a.out core
188 + rm -rf *.o *.a *.lo *.la *.so test_dibtoxpm a.out core
191 rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o *.a test_dibtoxpm core
193 $(MKINSTALLDIRS) $(DESTDIR)@libdir@ \
194 $(DESTDIR)$(INCLUDEDIR)
196 -install: all installdirs
197 +install: installdirs
198 $(INSTALL_DATA) dibtoxpm.h $(DESTDIR)$(INCLUDEDIR)/dibtoxpm.h
199 - $(INSTALL_DATA) libdib.a $(DESTDIR)@libdir@/libdib.a
201 + libtool $(INSTALL_DATA) libdib.la $(DESTDIR)@libdir@/libdib.la
203 # DO NOT DELETE THIS LINE -- make depend depends on it.
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
209 rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o *.a core
211 -install: all installdirs
212 +install: installdirs
213 $(INSTALL_DATA) libsvg.a $(DESTDIR)@libdir@/libsvg.a
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
222 -LDFLAGS = @LDFLAGS@ -L.
247 all: libxfig.a libeps.a
249 libxfig.a: $(XFOBJECTS)
250 - $(AR) rc libxfig.a $(XFOBJECTS)
251 - $(RANLIB) libxfig.a
252 + libtool --mode=link $(CC) $(LDFLAGS) -o libxfig.la $(XFOBJECTS) -rpath @libdir@
254 libeps.a: $(EPSOBJECTS)
255 - $(AR) rc libeps.a $(EPSOBJECTS)
257 + libtool --mode=link $(CC) $(LDFLAGS) -o libeps.la $(EPSOBJECTS) -rpath @libdir@
260 $(CC) $(CFLAGS) -c $*.c
263 + libtool $(CC) $(CFLAGS) -c $*.c
266 - rm -rf *.o *.a core
267 + rm -rf *.o *.a *.la *.lo *.so* core
270 - rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o *.a core
272 + rm -rf config.cache config.status config.log Makefile config.h lex.yy.c
274 -install: all installdirs
275 - $(INSTALL_DATA) libxfig.a $(DESTDIR)@libdir@/libxfig.a
276 - $(INSTALL_DATA) libeps.a $(DESTDIR)@libdir@/libeps.a
277 +install: installdirs
278 + libtool $(INSTALL_DATA) libxfig.la $(DESTDIR)@libdir@/libxfig.la
279 + libtool $(INSTALL_DATA) libeps.la $(DESTDIR)@libdir@/libeps.la
282 $(MKINSTALLDIRS) $(DESTDIR)@libdir@ \
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
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@
292 +LIBDIRS=-L./.libs $(LDFLAGS)
294 #Location where libxgd.a should be installed by "make install".
297 BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
298 TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf
301 + $(CC) $(CFLAGS) -c $*.c
303 + libtool $(CC) $(CFLAGS) -c $*.c
305 all: libxgd.a $(PROGRAMS)
307 -install: libxgd.a $(BIN_PROGRAMS)
308 - $(INSTALL) libxgd.a $(DESTDIR)$(INSTALL_LIB)/libxgd.a
310 + libtool $(INSTALL) libxgd.la $(DESTDIR)$(INSTALL_LIB)/libxgd.la
311 $(INSTALL) pngtogd $(DESTDIR)$(INSTALL_BIN)/pngtogd
312 $(INSTALL) pngtogd2 $(DESTDIR)$(INSTALL_BIN)/pngtogd2
313 $(INSTALL) gdtopng $(DESTDIR)$(INSTALL_BIN)/gdtopng
314 @@ -134,19 +140,17 @@
315 gdtestttf: gdtestttf.o libxgd.a
316 $(CC) gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS)
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
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
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
334 +libxgd.a: $(XGDOBJECTS) gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
335 + libtool --mode=link $(CC) -lm -lpng -lz -lttf $(LDFLAGS) -o libxgd.la $(XGDOBJECTS) -rpath @libdir@
338 - rm -f *.o *.a ${PROGRAMS} core
339 + rm -f *.o *.a *.la *.lo *.so* ${PROGRAMS}
342 rm -f *.o *.a ${PROGRAMS} core Makefile