1 diff -Nur libwmf.orig/Makefile.in libwmf/Makefile.in
2 --- libwmf.orig/Makefile.in Thu Jan 25 18:03:53 2001
3 +++ libwmf/Makefile.in Thu Jan 25 21:43:40 2001
5 -LIBS = -L./libdib -ldib @XPM_LIBS@ @LIBS@ -lm
6 +LIBS = @XPM_LIBS@ @LIBS@ -lm
8 -GDLIBS = -L./libdib -ldib -Lxgd-1.7.3 -lxgd @XPM_LIBS@ @LIBS@ @TTF_LIBS@ @PNG_CFLAGS@ @PNG_LIBS@ @ZLIB_LIBS@ -lm
9 +GDLIBS = @XPM_LIBS@ @LIBS@ @TTF_LIBS@ @PNG_CFLAGS@ @PNG_LIBS@ @ZLIB_LIBS@ -lm
11 -XFLIBS = -L./libxfig -lxfig -L./libdib -ldib @XPM_LIBS@ @LIBS@ @TTF_LIBS@ -lm
12 +XFLIBS = @XPM_LIBS@ @LIBS@ @TTF_LIBS@ -lm
14 -EPSLIBS = -L./libxfig -leps -L./libdib -ldib @XPM_LIBS@ @LIBS@ @TTF_LIBS@ -lm
15 +EPSLIBS = @XPM_LIBS@ @LIBS@ @TTF_LIBS@ -lm
19 -LDFLAGS = -L. @LDFLAGS@
57 TARGETS = wmftopng wmftofig wmftoeps xwmf
59 +BINLDIRS = -L./.libs -L./libdib/.libs -L./libxfig/.libs -L./xgd-1.7.3/.libs
63 xwmf: libwmf.a libXwmf.a xwmf.o LIBDIB
64 - $(CC) $(LDFLAGS) -o xwmf xwmf.o -L. -lXwmf -lwmf $(LIBS)
65 + $(CC) $(LDFLAGS) -o xwmf xwmf.o $(BINLDIRS) -lXwmf -lwmf -ldib $(LIBS)
67 wmftopng: libwmf.a libgdwmf.a wmftopng.o LIBXGD LIBDIB
68 - $(CC) $(LDFLAGS) -o wmftopng wmftopng.o -L. -lgdwmf -lwmf $(GDLIBS)
69 + $(CC) $(LDFLAGS) -o wmftopng wmftopng.o $(BINLDIRS) -lgdwmf -lwmf -ldib -lxgd $(GDLIBS)
71 wmftofig: libwmf.a libxfwmf.a wmftofig.o LIBXFIG
72 - $(CC) $(LDFLAGS) -o wmftofig wmftofig.o -L. -lxfwmf -lwmf $(XFLIBS)
73 + $(CC) $(LDFLAGS) -o wmftofig wmftofig.o $(BINLDIRS) -lxfwmf -lwmf -ldib -lxfig $(XFLIBS)
75 wmftoeps: libwmf.a libepswmf.a wmftoeps.o LIBXFIG
76 - $(CC) $(LDFLAGS) -o wmftoeps wmftoeps.o -L. -lepswmf -lwmf $(EPSLIBS)
77 + $(CC) $(LDFLAGS) -o wmftoeps wmftoeps.o $(BINLDIRS) -lepswmf -lwmf -ldib -leps $(EPSLIBS)
79 +libwmf.a: $(WMFLIBOBJECTS) LIBDIB
80 + libtool $(CC) $(LDFLAGS) -o libwmf.la $(WMFLIBOBJECTS) $(LIBS) -rpath @libdir@
82 +libgdwmf.a: $(GDLIBOBJECTS) LIBDIB LIBXGD
83 + libtool $(CC) $(LDFLAGS) -o libgdwmf.la $(GDLIBOBJECTS) $(GDLIBS) -rpath @libdir@
85 -libwmf.a: $(WMFLIBOBJECTS)
86 - $(AR) rc libwmf.a $(WMFLIBOBJECTS)
89 -libgdwmf.a: $(GDLIBOBJECTS)
90 - $(AR) rc libgdwmf.a $(GDLIBOBJECTS)
91 - $(RANLIB) libgdwmf.a
93 -libxfwmf.a: $(XFLIBOBJECTS)
94 - $(AR) rc libxfwmf.a $(XFLIBOBJECTS)
95 - $(RANLIB) libxfwmf.a
97 -libepswmf.a: $(EPSLIBOBJECTS)
98 - $(AR) rc libepswmf.a $(EPSLIBOBJECTS)
99 - $(RANLIB) libepswmf.a
101 -libXwmf.a: $(XLIBOBJECTS)
102 - $(AR) rc libXwmf.a $(XLIBOBJECTS)
103 - $(RANLIB) libXwmf.a
104 +libxfwmf.a: $(XFLIBOBJECTS) LIBDIB LIBXFIG
105 + libtool $(CC) $(LDFLAGS) -o libxfwmf.la $(XFLIBOBJECTS) $(XFLIBS) -rpath @libdir@
107 +libepswmf.a: $(EPSLIBOBJECTS) LIBDIB LIBXFIG
108 + libtool $(CC) $(LDFLAGS) -o libepswmf.la $(EPSLIBOBJECTS) $(EPSLIBS) -rpath @libdir@
110 +libXwmf.a: $(XLIBOBJECTS) LIBDIB
111 + libtool $(CC) $(LDFLAGS) -o libXwmf.la $(XLIBOBJECTS) $(LIBS) -rpath @libdir@
114 @echo making libdib in libdib
117 $(CC) $(CFLAGS) -c $*.c
120 + libtool $(CC) $(CFLAGS) -c $*.c
123 - rm -rf *.o wmftopng wmftofig wmftoeps xwmf a.out core *.a .pure
124 + rm -rf *.o wmftopng wmftofig xwmf a.out core *.a *.la *.so* *.lo .pure
127 @echo cleaning libdib in libdib
131 realclean: realcleansub
132 - rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o wmftopng wmftofig wmftoeps xwmf a.out *.a core .pure
133 + 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
136 @echo cleaning libdib in libdib
137 @@ -150,11 +150,21 @@
138 $(INSTALL) $(srcdir)/wmftopng $(DESTDIR)$(bindir)/wmftopng
139 $(INSTALL) $(srcdir)/wmftofig $(DESTDIR)$(bindir)/wmftofig
140 $(INSTALL) $(srcdir)/wmftoeps $(DESTDIR)$(bindir)/wmftoeps
141 - $(INSTALL_DATA) $(srcdir)/libwmf.a $(DESTDIR)$(libdir)/libwmf.a
142 - $(INSTALL_DATA) $(srcdir)/libgdwmf.a $(DESTDIR)$(libdir)/libgdwmf.a
143 - $(INSTALL_DATA) $(srcdir)/libXwmf.a $(DESTDIR)$(libdir)/libXwmf.a
144 - $(INSTALL_DATA) $(srcdir)/libxfwmf.a $(DESTDIR)$(libdir)/libxfwmf.a
145 - $(INSTALL_DATA) $(srcdir)/libepswmf.a $(DESTDIR)$(libdir)/libepswmf.a
146 + libtool $(INSTALL_DATA) $(srcdir)/libwmf.la $(DESTDIR)$(libdir)/libwmf.la
147 + sed -e "s|dependency_libs='|& -ldib|" < $(DESTDIR)$(libdir)/libwmf.la \
148 + > $(DESTDIR)$(libdir)/.libwmf.la && mv -f $(DESTDIR)$(libdir)/{.,}libwmf.la
149 + libtool $(INSTALL_DATA) $(srcdir)/libgdwmf.la $(DESTDIR)$(libdir)/libgdwmf.la
150 + sed -e "s|dependency_libs='|& -ldib -lwmf -lxgd|" < $(DESTDIR)$(libdir)/libgdwmf.la \
151 + > $(DESTDIR)$(libdir)/.libgdwmf.la && mv -f $(DESTDIR)$(libdir)/{.,}libgdwmf.la
152 + libtool $(INSTALL_DATA) $(srcdir)/libXwmf.la $(DESTDIR)$(libdir)/libXwmf.la
153 + sed -e "s|dependency_libs='|& -ldib -lwmf|" < $(DESTDIR)$(libdir)/libXwmf.la \
154 + > $(DESTDIR)$(libdir)/.libXwmf.la && mv -f $(DESTDIR)$(libdir)/{.,}libXwmf.la
155 + libtool $(INSTALL_DATA) $(srcdir)/libxfwmf.la $(DESTDIR)$(libdir)/libxfwmf.la
156 + sed -e "s|dependency_libs='|& -ldib -lwmf -lxfig|" < $(DESTDIR)$(libdir)/libxfwmf.la \
157 + > $(DESTDIR)$(libdir)/.libxfwmf.la && mv -f $(DESTDIR)$(libdir)/{.,}libxfwmf.la
158 + libtool $(INSTALL_DATA) $(srcdir)/libepswmf.la $(DESTDIR)$(libdir)/libepswmf.la
159 + sed -e "s|dependency_libs='|& -ldib -lwmf -leps|" < $(DESTDIR)$(libdir)/libepswmf.la \
160 + > $(DESTDIR)$(libdir)/.libepswmf.la && mv -f $(DESTDIR)$(libdir)/{.,}libepswmf.la
161 $(INSTALL_DATA) wmfapi.h $(DESTDIR)$(INCLUDEDIR)/wmfapi.h
162 $(INSTALL_DATA) gdwmfapi.h $(DESTDIR)$(INCLUDEDIR)/gdwmfapi.h
163 $(INSTALL_DATA) Xwmfapi.h $(DESTDIR)$(INCLUDEDIR)/Xwmfapi.h
164 diff -Nur libwmf.orig/libdib/Makefile.in libwmf/libdib/Makefile.in
165 --- libwmf.orig/libdib/Makefile.in Thu Jan 25 18:03:53 2001
166 +++ libwmf/libdib/Makefile.in Thu Jan 25 21:43:07 2001
170 -LDFLAGS = @LDFLAGS@ -L.
186 all: libdib.a test_dibtoxpm
188 libdib.a: $(MYOBJECTS)
189 - $(AR) rc libdib.a $(MYOBJECTS)
191 + libtool $(CC) $(LDFLAGS) -o libdib.la $(MYOBJECTS) -rpath @libdir@
193 test_dibtoxpm: libdib.a test_dibtoxpm.o
194 - $(CC) $(LDFLAGS) -o test_dibtoxpm test_dibtoxpm.o -ldib
195 + $(CC) $(LDFLAGS) -o test_dibtoxpm test_dibtoxpm.o -L./.libs -ldib
198 $(CC) $(CFLAGS) -c $*.c
201 + libtool $(CC) $(CFLAGS) -c $*.c
204 - rm -rf *.o *.a test_dibtoxpm a.out core
205 + rm -rf *.o *.a *.lo *.la *.so test_dibtoxpm a.out core
208 rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o *.a test_dibtoxpm core
211 install: all installdirs
212 $(INSTALL_DATA) dibtoxpm.h $(DESTDIR)$(INCLUDEDIR)/dibtoxpm.h
213 - $(INSTALL_DATA) libdib.a $(DESTDIR)@libdir@/libdib.a
215 + libtool $(INSTALL_DATA) libdib.la $(DESTDIR)@libdir@/libdib.la
217 # DO NOT DELETE THIS LINE -- make depend depends on it.
218 diff -Nur libwmf.orig/libxfig/Makefile.in libwmf/libxfig/Makefile.in
219 --- libwmf.orig/libxfig/Makefile.in Thu Jan 25 18:03:53 2001
220 +++ libwmf/libxfig/Makefile.in Thu Jan 25 21:43:07 2001
224 -LDFLAGS = @LDFLAGS@ -L.
249 all: libxfig.a libeps.a
251 libxfig.a: $(XFOBJECTS)
252 - $(AR) rc libxfig.a $(XFOBJECTS)
253 - $(RANLIB) libxfig.a
254 + libtool $(CC) $(LDFLAGS) -o libxfig.la $(XFOBJECTS) -rpath @libdir@
256 libeps.a: $(EPSOBJECTS)
257 - $(AR) rc libeps.a $(EPSOBJECTS)
259 + libtool $(CC) $(LDFLAGS) -o libeps.la $(EPSOBJECTS) -rpath @libdir@
262 $(CC) $(CFLAGS) -c $*.c
265 + libtool $(CC) $(CFLAGS) -c $*.c
268 - rm -rf *.o *.a core
269 + rm -rf *.o *.a *.la *.lo *.so* core
272 - rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o *.a core
274 + rm -rf config.cache config.status config.log Makefile config.h lex.yy.c
276 install: all installdirs
277 - $(INSTALL_DATA) libxfig.a $(DESTDIR)@libdir@/libxfig.a
278 - $(INSTALL_DATA) libeps.a $(DESTDIR)@libdir@/libeps.a
279 + libtool $(INSTALL_DATA) libxfig.la $(DESTDIR)@libdir@/libxfig.la
280 + libtool $(INSTALL_DATA) libeps.la $(DESTDIR)@libdir@/libeps.la
283 $(MKINSTALLDIRS) $(DESTDIR)@libdir@ \
284 diff -Nur libwmf.orig/xgd-1.7.3/Makefile.in libwmf/xgd-1.7.3/Makefile.in
285 --- libwmf.orig/xgd-1.7.3/Makefile.in Thu Jan 25 18:03:53 2001
286 +++ libwmf/xgd-1.7.3/Makefile.in Thu Jan 25 21:43:07 2001
288 #-L. as this allows the gd library itself to be found.
289 #Put -L. first so that old versions of the gd library elsewhere
290 #on your system can't cause conflicts while building a new one.
291 -LIBDIRS=-L. @LDFLAGS@
293 +LIBDIRS=-L./.libs $(LDFLAGS)
295 #Location where libxgd.a should be installed by "make install".
298 BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
299 TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf
302 + $(CC) $(CFLAGS) -c $*.c
304 + libtool $(CC) $(CFLAGS) -c $*.c
306 all: libxgd.a $(PROGRAMS)
308 install: libxgd.a $(BIN_PROGRAMS)
309 - $(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 $(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