cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- remove -L. from LDFLAGS

Browse Source 
- use --quiet option with libtool
This commit is contained in:
brad 2000-07-02 03:41:06 +00:00
parent 964180285b
commit 5740769a24
2 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/gd/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2000/06/25 22:26:27 brad Exp $
# $OpenBSD: Makefile,v 1.21 2000/07/02 03:41:06 brad Exp $
# $FreeBSD: Makefile,v 1.5 1998/06/25 03:13:16 vanilla Exp $
DISTNAME= gd-1.8.3
@ -32,13 +32,13 @@ FLAVORS= no_x11
MAKE_FLAGS+= CFLAGS="${CFLAGS} -DHAVE_JPEG" \
LIBS="libgd.la -lm -lpng -ljpeg -lz" \
INCLUDEDIRS="-I. -I/usr/local/include" \
LIBDIRS="-L. -L/usr/local/lib"
LIBDIRS="-L/usr/local/lib"
FAKE_FLAGS+= ${MAKE_FLAGS}
.else
MAKE_FLAGS+= CFLAGS="${CFLAGS} -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF" \
LIBS="libgd.la -lm -lpng -lz -ljpeg -lttf -lXpm -lX11" \
INCLUDEDIRS="-I. -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11" \
LIBDIRS="-L. -L/usr/local/lib -L/usr/X11R6/lib"
LIBDIRS="-L/usr/local/lib -L/usr/X11R6/lib"
FAKE_FLAGS+= ${MAKE_FLAGS}
.endif

56
graphics/gd/patches/patch-Makefile
View File

@ -1,5 +1,5 @@
--- Makefile.orig Sat Jun 3 15:26:12 2000
+++ Makefile Sat Jun 24 22:23:50 2000
+++ Makefile Sat Jul 1 23:25:00 2000
@@ -51,13 +51,13 @@
LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib
@ -17,7 +17,15 @@
#
#
@@ -78,68 +78,68 @@
@@ -69,6 +69,7 @@
CC=$(COMPILER) $(INCLUDEDIRS)
LINK=$(CC) $(LIBDIRS) $(LIBS)
+LIBTOOL=libtool --quiet
PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS)
@@ -78,68 +79,68 @@
all: libgd.a $(PROGRAMS)
install: libgd.a $(BIN_PROGRAMS)
@ -82,15 +90,15 @@
- gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \
- gdtables.o gdttf.o gdcache.o gdkanji.o wbmp.o gd_wbmp.o
- -ranlib libgd.a
+ libtool --mode=install $(BSD_INSTALL_DATA) libgd.la $(DESTDIR)$(INSTALL_LIB)
+ libtool --mode=install $(BSD_INSTALL_PROGRAM) pngtogd $(DESTDIR)$(INSTALL_BIN)
+ libtool --mode=install $(BSD_INSTALL_PROGRAM) pngtogd2 $(DESTDIR)$(INSTALL_BIN)
+ libtool --mode=install $(BSD_INSTALL_PROGRAM) gdtopng $(DESTDIR)$(INSTALL_BIN)
+ libtool --mode=install $(BSD_INSTALL_PROGRAM) gd2topng $(DESTDIR)$(INSTALL_BIN)
+ libtool --mode=install $(BSD_INSTALL_PROGRAM) gd2copypal $(DESTDIR)$(INSTALL_BIN)
+ libtool --mode=install $(BSD_INSTALL_PROGRAM) gdparttopng $(DESTDIR)$(INSTALL_BIN)
+ libtool --mode=install $(BSD_INSTALL_PROGRAM) webpng $(DESTDIR)$(INSTALL_BIN)
+ libtool --mode=install $(BSD_INSTALL_PROGRAM) bdftogd $(DESTDIR)$(INSTALL_BIN)
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) libgd.la $(DESTDIR)$(INSTALL_LIB)
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) pngtogd $(DESTDIR)$(INSTALL_BIN)
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) pngtogd2 $(DESTDIR)$(INSTALL_BIN)
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) gdtopng $(DESTDIR)$(INSTALL_BIN)
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) gd2topng $(DESTDIR)$(INSTALL_BIN)
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) gd2copypal $(DESTDIR)$(INSTALL_BIN)
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) gdparttopng $(DESTDIR)$(INSTALL_BIN)
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) webpng $(DESTDIR)$(INSTALL_BIN)
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) bdftogd $(DESTDIR)$(INSTALL_BIN)
+ $(BSD_INSTALL_DATA) gd.h $(DESTDIR)$(INSTALL_INCLUDE)
+ $(BSD_INSTALL_DATA) gdcache.h $(DESTDIR)$(INSTALL_INCLUDE)
+ $(BSD_INSTALL_DATA) gd_io.h $(DESTDIR)$(INSTALL_INCLUDE)
@ -101,43 +109,43 @@
+ $(BSD_INSTALL_DATA) gdfontt.h $(DESTDIR)$(INSTALL_INCLUDE)
+
+gddemo: gddemo.lo libgd.a
+ libtool --mode=link $(CC) gddemo.lo -o gddemo $(LIBDIRS) $(LIBS)
+ $(LIBTOOL) --mode=link $(CC) gddemo.lo -o gddemo $(LIBDIRS) $(LIBS)
+
+pngtogd: pngtogd.lo libgd.a
+ libtool --mode=link $(CC) pngtogd.lo -o pngtogd $(LIBDIRS) $(LIBS)
+ $(LIBTOOL) --mode=link $(CC) pngtogd.lo -o pngtogd $(LIBDIRS) $(LIBS)
+
+webpng: webpng.lo libgd.a
+ libtool --mode=link $(CC) webpng.lo -o webpng $(LIBDIRS) $(LIBS)
+ $(LIBTOOL) --mode=link $(CC) webpng.lo -o webpng $(LIBDIRS) $(LIBS)
+
+pngtogd2: pngtogd2.lo libgd.a
+ libtool --mode=link $(CC) pngtogd2.lo -o pngtogd2 $(LIBDIRS) $(LIBS)
+ $(LIBTOOL) --mode=link $(CC) pngtogd2.lo -o pngtogd2 $(LIBDIRS) $(LIBS)
+
+gdtopng: gdtopng.lo libgd.a
+ libtool --mode=link $(CC) gdtopng.lo -o gdtopng $(LIBDIRS) $(LIBS)
+ $(LIBTOOL) --mode=link $(CC) gdtopng.lo -o gdtopng $(LIBDIRS) $(LIBS)
+
+gd2topng: gd2topng.lo libgd.a
+ libtool --mode=link $(CC) gd2topng.lo -o gd2topng $(LIBDIRS) $(LIBS)
+ $(LIBTOOL) --mode=link $(CC) gd2topng.lo -o gd2topng $(LIBDIRS) $(LIBS)
+
+gd2copypal: gd2copypal.lo libgd.a
+ libtool --mode=link $(CC) gd2copypal.lo -o gd2copypal $(LIBDIRS) $(LIBS)
+ $(LIBTOOL) --mode=link $(CC) gd2copypal.lo -o gd2copypal $(LIBDIRS) $(LIBS)
+
+gdparttopng: gdparttopng.lo libgd.a
+ libtool --mode=link $(CC) gdparttopng.lo -o gdparttopng $(LIBDIRS) $(LIBS)
+ $(LIBTOOL) --mode=link $(CC) gdparttopng.lo -o gdparttopng $(LIBDIRS) $(LIBS)
+
+gdtest: gdtest.lo libgd.a
+ libtool --mode=link $(CC) gdtest.lo -o gdtest $(LIBDIRS) $(LIBS)
+ $(LIBTOOL) --mode=link $(CC) gdtest.lo -o gdtest $(LIBDIRS) $(LIBS)
+
+gd2time: gd2time.lo libgd.a
+ libtool --mode=link $(CC) gd2time.lo -o gd2time $(LIBDIRS) $(LIBS)
+ $(LIBTOOL) --mode=link $(CC) gd2time.lo -o gd2time $(LIBDIRS) $(LIBS)
+
+gdtestttf: gdtestttf.lo libgd.a
+ libtool --mode=link $(CC) gdtestttf.lo -o gdtestttf $(LIBDIRS) $(LIBS)
+ $(LIBTOOL) --mode=link $(CC) gdtestttf.lo -o gdtestttf $(LIBDIRS) $(LIBS)
+
+libgd.a: 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 gd_jpeg.lo gdxpm.lo gdfontt.lo gdfonts.lo \
+ gdfontmb.lo gdfontl.lo gdfontg.lo gdtables.lo gdttf.lo gdcache.lo \
+ gdkanji.lo wbmp.lo gd_wbmp.lo
+ libtool --mode=link $(CC) $(CFLAGS) -o libgd.la $(.ALLSRC) \
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libgd.la $(.ALLSRC) \
+ -version-info 18:3:0 -rpath $(INSTALL_LIB)
clean:
@ -147,4 +155,4 @@
+.SUFFIXES: .c .lo
+
+.c.lo:
+ libtool --mode=compile $(CC) $(CFLAGS) -c $(.IMPSRC)
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $(.IMPSRC)