use --mode option with libtool

This commit is contained in:
brad 2000-06-25 02:20:52 +00:00
parent 0055b003f6
commit 3528909fd6

View File

@ -1,5 +1,5 @@
--- scripts/makefile.std.orig Wed Dec 8 18:44:40 1999 --- scripts/makefile.std.orig Wed Dec 8 18:44:40 1999
+++ scripts/makefile.std Thu Jun 22 04:04:46 2000 +++ scripts/makefile.std Sat Jun 24 22:06:31 2000
@@ -8,8 +8,6 @@ @@ -8,8 +8,6 @@
# Where the zlib library and include files are located # Where the zlib library and include files are located
#ZLIBLIB=/usr/local/lib #ZLIBLIB=/usr/local/lib
@ -25,18 +25,18 @@
+.SUFFIXES: .c .lo +.SUFFIXES: .c .lo
+ +
+.c.lo: +.c.lo:
+ libtool $(CC) $(CFLAGS) -c $(.IMPSRC) + libtool --mode=compile $(CC) $(CFLAGS) -c $(.IMPSRC)
+ +
libpng.a: $(OBJS) libpng.a: $(OBJS)
- ar rc $@ $(OBJS) - ar rc $@ $(OBJS)
- $(RANLIB) $@ - $(RANLIB) $@
+ libtool $(CC) $(CFLAGS) -o libpng.la $(OBJS) \ + libtool --mode=link $(CC) $(CFLAGS) -o libpng.la $(OBJS) \
+ -version-info 1:6:0 -rpath $(prefix)/lib + -version-info 1:6:0 -rpath $(prefix)/lib
-pngtest: pngtest.o libpng.a -pngtest: pngtest.o libpng.a
- $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) - $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
+pngtest: pngtest.lo libpng.a +pngtest: pngtest.lo libpng.a
+ libtool $(CC) -o pngtest $(CFLAGS) pngtest.lo $(LDFLAGS) + libtool --mode=link $(CC) -o pngtest $(CFLAGS) pngtest.lo $(LDFLAGS)
test: pngtest test: pngtest
./pngtest ./pngtest
@ -53,7 +53,7 @@
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/include + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/include
+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/lib + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/lib
+ ${BSD_INSTALL_DATA} png.h pngconf.h $(DESTDIR)$(prefix)/include + ${BSD_INSTALL_DATA} png.h pngconf.h $(DESTDIR)$(prefix)/include
+ libtool ${BSD_INSTALL_DATA} libpng.la $(DESTDIR)$(prefix)/lib + libtool --mode=install ${BSD_INSTALL_DATA} libpng.la $(DESTDIR)$(prefix)/lib
clean: clean:
- rm -f *.o libpng.a pngtest pngout.png - rm -f *.o libpng.a pngtest pngout.png