- my version of DESTDIR patch (compatible with -shared patch, which I wrote

[packages/libwmf.git] / libwmf-shared.patch

diff -Nur libwmf.pre/Makefile.in libwmf/Makefile.in
--- libwmf.pre/Makefile.in	Thu Dec 28 17:41:49 2000
+++ libwmf/Makefile.in	Thu Dec 28 19:06:58 2000
@@ -37,21 +37,21 @@
 .SUFFIXES: .C .o
 
 WMFLIBOBJECTS =	\
-	wmfapi.o \
-	stack.o \
-	bytelevel.o
+	wmfapi.lo \
+	stack.lo \
+	bytelevel.lo
 
 GDLIBOBJECTS =	\
-	gdwmfapi.o \
-	wmftt.o
+	gdwmfapi.lo \
+	wmftt.lo
 
 XFLIBOBJECTS =	\
-	xfwmfapi.o 
+	xfwmfapi.lo 
 
 XLIBOBJECTS =	\
-	Xwmfapi.o \
-	Xtext.o \
-	rotated.o
+	Xwmfapi.lo \
+	Xtext.lo \
+	rotated.lo
 
 TARGETS = wmftopng wmftofig xwmf
 
@@ -67,20 +67,20 @@
 	$(CC) $(LDFLAGS) -o wmftofig wmftofig.o -L. -lxfwmf -lwmf $(XFLIBS)
 
 libwmf.a:	$(WMFLIBOBJECTS)
-	 $(AR) rc libwmf.a $(WMFLIBOBJECTS) 
-	 $(RANLIB) libwmf.a 
+	libtool $(CC) $(LDFLAGS) -o libwmf.la $(WMFLIBOBJECTS) -rpath @libdir@
+	mv -f .libs/libwmf.{a,so*} .
 
 libgdwmf.a:	$(GDLIBOBJECTS)
-	 $(AR) rc libgdwmf.a $(GDLIBOBJECTS) 
-	 $(RANLIB) libgdwmf.a
+	libtool $(CC) $(LDFLAGS) -o libgdwmf.la $(GDLIBOBJECTS) -rpath @libdir@
+	mv -f .libs/libgdwmf.{a,so*} .
 
 libxfwmf.a:	$(XFLIBOBJECTS)
-	 $(AR) rc libxfwmf.a $(XFLIBOBJECTS) 
-	 $(RANLIB) libxfwmf.a
+	libtool $(CC) $(LDFLAGS) -o libxfwmf.la $(XFLIBOBJECTS) -rpath @libdir@
+	mv -f .libs/libxfwmf.{a,so*} .
 
 libXwmf.a:	$(XLIBOBJECTS)
-	 $(AR) rc libXwmf.a $(XLIBOBJECTS) 
-	 $(RANLIB) libXwmf.a
+	libtool $(CC) $(LDFLAGS) -o libXwmf.la $(XLIBOBJECTS) -rpath @libdir@
+	mv -f .libs/libXwmf.{a,so*} .
 
 LIBDIB:
 	@echo making libdib in libdib
@@ -96,9 +96,11 @@
 
 %.o: %.c 
 	$(CC) $(CFLAGS) -c $*.c 
+%.lo: %.c 
+	libtool $(CC) $(CFLAGS) -c $*.c 
 
 clean: cleansub
-	rm -rf *.o wmftopng wmftofig xwmf a.out core *.a .pure
+	rm -rf *.o wmftopng wmftofig xwmf a.out core *.a *.la *.so* *.lo .pure
 
 cleansub:
 	@echo cleaning libdib in libdib
@@ -119,7 +121,7 @@
 distclean: realclean
 
 realclean: realcleansub
-	rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o wmftopng wmftofig xwmf a.out *.a core .pure
+	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
 
 realcleansub:
 	@echo cleaning libdib in libdib
@@ -141,6 +143,15 @@
 	$(INSTALL_DATA) $(srcdir)/libgdwmf.a $(DESTDIR)$(libdir)/libgdwmf.a
 	$(INSTALL_DATA) $(srcdir)/libXwmf.a $(DESTDIR)$(libdir)/libXwmf.a
 	$(INSTALL_DATA) $(srcdir)/libxfwmf.a $(DESTDIR)$(libdir)/libxfwmf.a
+	$(INSTALL_DATA) $(srcdir)/libwmf.la $(DESTDIR)$(libdir)/libwmf.la
+	$(INSTALL_DATA) $(srcdir)/libgdwmf.la $(DESTDIR)$(libdir)/libgdwmf.la
+	$(INSTALL_DATA) $(srcdir)/libXwmf.la $(DESTDIR)$(libdir)/libXwmf.la
+	$(INSTALL_DATA) $(srcdir)/libxfwmf.la $(DESTDIR)$(libdir)/libxfwmf.la
+	$(INSTALL_DATA) $(srcdir)/libwmf.so.* $(DESTDIR)$(libdir)
+	$(INSTALL_DATA) $(srcdir)/libgdwmf.so.* $(DESTDIR)$(libdir)
+	$(INSTALL_DATA) $(srcdir)/libXwmf.so.* $(DESTDIR)$(libdir)
+	$(INSTALL_DATA) $(srcdir)/libxfwmf.so.* $(DESTDIR)$(libdir)
+	cp -df $(srcdir)/{libwmf,libgdwmf,libXwmf,libxfwmf}.so $(DESTDIR)$(libdir)
 	$(INSTALL_DATA) wmfapi.h $(DESTDIR)$(INCLUDEDIR)/wmfapi.h
 	$(INSTALL_DATA) gdwmfapi.h $(DESTDIR)$(INCLUDEDIR)/gdwmfapi.h
 	$(INSTALL_DATA) Xwmfapi.h $(DESTDIR)$(INCLUDEDIR)/Xwmfapi.h
diff -Nur libwmf.pre/libdib/Makefile.in libwmf/libdib/Makefile.in
--- libwmf.pre/libdib/Makefile.in	Thu Dec 28 17:41:49 2000
+++ libwmf/libdib/Makefile.in	Thu Dec 28 19:04:43 2000
@@ -31,24 +31,26 @@
 .SUFFIXES: .C .o
 
 MYOBJECTS = \
-    bytelevel.o \
-    bintree.o \
-    dibtoxpm.o
+    bytelevel.lo \
+    bintree.lo \
+    dibtoxpm.lo
 
 all: libdib.a test_dibtoxpm
 
 libdib.a:  $(MYOBJECTS)
-	$(AR) rc libdib.a $(MYOBJECTS)
-	$(RANLIB) libdib.a 
+	libtool $(CC) $(LDFLAGS) -o libdib.la $(MYOBJECTS) -rpath @libdir@
+	mv -f .libs/libdib.{a,so*} .
 
 test_dibtoxpm:  libdib.a test_dibtoxpm.o
 	$(CC) $(LDFLAGS) -o test_dibtoxpm test_dibtoxpm.o -ldib
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c $*.c
+%.lo: %.c
+	libtool $(CC) $(CFLAGS) -c $*.c
 
 clean:
-	rm -rf *.o *.a test_dibtoxpm a.out core
+	rm -rf *.o *.a *.lo *.la *.so test_dibtoxpm a.out core
 
 realclean: 
 	rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o *.a test_dibtoxpm core
@@ -60,6 +62,8 @@
 install: all installdirs
 	$(INSTALL_DATA) dibtoxpm.h $(DESTDIR)$(INCLUDEDIR)/dibtoxpm.h
 	$(INSTALL_DATA) libdib.a $(DESTDIR)@libdir@/libdib.a
-
+	$(INSTALL_DATA) libdib.so.* $(DESTDIR)@libdir@
+	cp -df libdib.so $(DESTDIR)@libdir@
+	$(INSTALL_DATA) libdib.la $(DESTDIR)@libdir@/libdib.la
 
 #  DO  NOT  DELETE THIS LINE -- make depend depends on it.
diff -Nur libwmf.pre/libxfig/Makefile.in libwmf/libxfig/Makefile.in
--- libwmf.pre/libxfig/Makefile.in	Thu Dec 28 17:41:49 2000
+++ libwmf/libxfig/Makefile.in	Thu Dec 28 19:05:09 2000
@@ -31,27 +31,32 @@
 .SUFFIXES: .C .o
 
 MYOBJECTS = \
-	color.o \
-	objlist.o \
-	fileops.o
+	color.lo \
+	objlist.lo \
+	fileops.lo
 
 all: libxfig.a 
 
 libxfig.a:  $(MYOBJECTS)
-	$(AR) rc libxfig.a $(MYOBJECTS)
-	$(RANLIB) libxfig.a 
+	libtool $(CC) $(LDFLAGS) -o libxfig.la $(MYOBJECTS) -rpath @libdir@
+	mv -f .libs/libxfig.{a,so*} .
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c $*.c
+%.lo: %.c
+	libtool $(CC) $(CFLAGS) -c $*.c
 
 clean:
-	rm -rf *.o *.a core
+	rm -rf *.o *.a *.la *.lo *.so* core
 
-realclean: 
-	rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o *.a core
+realclean: clean
+	rm -rf config.cache config.status config.log Makefile config.h lex.yy.c
 
 install: all installdirs
 	$(INSTALL_DATA) libxfig.a $(DESTDIR)@libdir@/libxfig.a
+	$(INSTALL_DATA) libxfig.la $(DESTDIR)@libdir@/libxfig.la
+	$(INSTALL_DATA) libxfig.so.* $(DESTDIR)@libdir@
+	cp -df libxfig.so $(DESTDIR)@libdir@
 
 installdirs:
 	$(MKINSTALLDIRS) $(DESTDIR)@libdir@ \
diff -Nur libwmf.pre/xgd-1.7.3/Makefile.in libwmf/xgd-1.7.3/Makefile.in
--- libwmf.pre/xgd-1.7.3/Makefile.in	Thu Dec 28 17:41:49 2000
+++ libwmf/xgd-1.7.3/Makefile.in	Thu Dec 28 19:05:52 2000
@@ -80,10 +80,18 @@
 BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
 TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf
 
+%.o: %.c
+	$(CC) $(CFLAGS) -c $*.c
+%.lo: %.c
+	libtool $(CC) $(CFLAGS) -c $*.c
+
 all: libxgd.a $(PROGRAMS)
 
 install: libxgd.a $(BIN_PROGRAMS)
 	$(INSTALL) libxgd.a $(INSTALL_LIB)/libxgd.a
+	$(INSTALL) libxgd.la $(INSTALL_LIB)/libxgd.la
+	$(INSTALL) libxgd.so.* $(INSTALL_LIB)
+	cp -df libxgd.so $(INSTALL_LIB)
 	$(INSTALL) pngtogd $(INSTALL_BIN)/pngtogd
 	$(INSTALL) pngtogd2 $(INSTALL_BIN)/pngtogd2
 	$(INSTALL) gdtopng $(INSTALL_BIN)/gdtopng
@@ -134,17 +142,16 @@
 gdtestttf: gdtestttf.o libxgd.a
 	$(CC) gdtestttf.o -o gdtestttf	$(LIBDIRS) $(LIBS)
 
-libxgd.a: gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \
-	gd_io_ss.o gd_png.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \
-	gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o \
-	gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
+XGDOBJECTS = \
+	gd.lo gd_gd.lo gd_gd2.lo gd_io.lo gd_io_dp.lo gd_io_file.lo gd_ss.lo \
+	gd_io_ss.lo gd_png.lo gdxpm.lo gdfontt.lo gdfonts.lo gdfontmb.lo gdfontl.lo \
+	gdfontg.lo gdtables.lo gdttf.lo gdcache.lo gdkanji.lo
+	
+libxgd.a: $(XGDOBJECTS) gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
 	rm -f libxgd.a
-	$(AR) rc libxgd.a gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o \
-		gd_io_file.o gd_ss.o gd_io_ss.o gd_png.o gdxpm.o \
-		gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \
-		gdtables.o gdttf.o gdcache.o gdkanji.o
-	-ranlib libxgd.a
+	libtool $(CC) -lm -lpng -lz -lttf $(LDFLAGS) -o libxgd.la $(XGDOBJECTS) -rpath @libdir@
+	mv -f .libs/libxgd.{a,so*} .
 
 clean:
-	rm -f *.o *.a ${PROGRAMS}
+	rm -f *.o *.a *.la *.lo *.so* ${PROGRAMS}