$NetBSD: patch-aa,v 1.8 2000/06/14 16:33:49 he Exp $

--- Makefile.orig	Sat Jun  3 21:26:12 2000
+++ Makefile	Wed Jun 14 17:43:30 2000
@@ -5,16 +5,18 @@
 #compiler; get gcc if you are still using it). 
 COMPILER=gcc
 
+INSTALL=$(LIBTOOL) install -c -m
+
 #If the ar command fails on your system, consult the ar manpage
 #for your system. 
 AR=ar
 
 #If you don't have FreeType, libjpeg and/or Xpm installed, including the
 #header files, uncomment this (default).
-CFLAGS=-O
+#CFLAGS=-O
 #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a
 #variation of this and comment out the line above. See also LIBS below.
-#CFLAGS=-O  -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
+CFLAGS=-O  -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
 
 #If you don't have FreeType and/or Xpm fully installed, uncomment this
 #(default).
@@ -23,7 +25,7 @@
 #Some systems are very picky about link order. They don't all agree
 #on the right order, either.
 
-LIBS=-lm -lgd -lpng -lz
+#LIBS=-lm -lgd -lpng -lz
 
 #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a 
 #variation of this and comment out the line above. Note that
@@ -33,14 +35,14 @@
 #Some systems are very picky about link order. They don't all agree
 #on the right order, either.
 
-#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
+LIBS=$(LIBGD) -lm -lpng -lz -ljpeg -lttf -lXpm -lX11 -lintl
 
 #Typical install locations for freetype, zlib, xpm, libjpeg and libpng header files.
 #If yours are somewhere else, change this. 
 #-I. is important to ensure that the version of gd you are installing
 #is used, and not an older release in your directory tree somewhere.
 
-INCLUDEDIRS=-I. -I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11
+INCLUDEDIRS=-I. ${CPPFLAGS}
 
 #Typical install locations for freetype, zlib, xpm and libpng libraries.
 #If yours are somewhere else, other than a standard location
@@ -48,16 +50,16 @@
 #-L. as this allows the gd library itself to be found.
 #Put -L. first so that old versions of the gd library elsewhere
 #on your system can't cause conflicts while building a new one.
-LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib
+LIBDIRS=${LDFLAGS}
 
 #Location where libgd.a should be installed by "make install".
-INSTALL_LIB=/usr/local/lib
+INSTALL_LIB=${PREFIX}/lib
 
 #Location where .h files should be installed by "make install".
-INSTALL_INCLUDE=/usr/local/include
+INSTALL_INCLUDE=${PREFIX}/include
 
 #Location where useful non-test programs should be installed by "make install".
-INSTALL_BIN=/usr/local/bin
+INSTALL_BIN=${PREFIX}/bin
 
 #
 #
@@ -65,9 +67,9 @@
 #
 #
 
-VERSION=1.8.1
+VERSION=1.8.3
 
-CC=$(COMPILER) $(INCLUDEDIRS)
+CC=$(LIBTOOL) $(COMPILER) $(INCLUDEDIRS)
 LINK=$(CC) $(LIBDIRS) $(LIBS)
 
 PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS)
@@ -75,71 +77,71 @@
 BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
 TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf
 
-all: libgd.a $(PROGRAMS)
+LIBGD=libgd.la
+
+all: $(LIBGD) $(PROGRAMS)
 
-install: libgd.a $(BIN_PROGRAMS)
-	sh ./install-item 644 libgd.a $(INSTALL_LIB)/libgd.a
-	sh ./install-item 755 pngtogd $(INSTALL_BIN)/pngtogd
-	sh ./install-item 755 pngtogd2 $(INSTALL_BIN)/pngtogd2
-	sh ./install-item 755 gdtopng $(INSTALL_BIN)/gdtopng
-	sh ./install-item 755 gd2topng $(INSTALL_BIN)/gd2topng
-	sh ./install-item 755 gd2copypal $(INSTALL_BIN)/gd2copypal
-	sh ./install-item 755 gdparttopng $(INSTALL_BIN)/gdparttopng
-	sh ./install-item 755 webpng $(INSTALL_BIN)/webpng
-	sh ./install-item 755 bdftogd $(INSTALL_BIN)/bdftogd
-	sh ./install-item 644 gd.h $(INSTALL_INCLUDE)/gd.h
-	sh ./install-item 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h
-	sh ./install-item 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h
-	sh ./install-item 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h
-	sh ./install-item 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h
-	sh ./install-item 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h
-	sh ./install-item 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h
-	sh ./install-item 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h
+install: $(LIBGD) $(BIN_PROGRAMS)
+	sh $(INSTALL) 644 $(LIBGD) $(INSTALL_LIB)
+	sh $(INSTALL) 755 pngtogd $(INSTALL_BIN)/pngtogd
+	sh $(INSTALL) 755 pngtogd2 $(INSTALL_BIN)/pngtogd2
+	sh $(INSTALL) 755 gdtopng $(INSTALL_BIN)/gdtopng
+	sh $(INSTALL) 755 gd2topng $(INSTALL_BIN)/gd2topng
+	sh $(INSTALL) 755 gd2copypal $(INSTALL_BIN)/gd2copypal
+	sh $(INSTALL) 755 gdparttopng $(INSTALL_BIN)/gdparttopng
+	sh $(INSTALL) 755 webpng $(INSTALL_BIN)/webpng
+	sh $(INSTALL) 755 bdftogd $(INSTALL_BIN)/bdftogd
+	sh $(INSTALL) 644 gd.h $(INSTALL_INCLUDE)/gd.h
+	sh $(INSTALL) 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h
+	sh $(INSTALL) 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h
+	sh $(INSTALL) 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h
+	sh $(INSTALL) 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h
+	sh $(INSTALL) 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h
+	sh $(INSTALL) 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h
+	sh $(INSTALL) 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h
 
-gddemo: gddemo.o libgd.a
+gddemo: gddemo.o $(LIBGD)
 	$(CC) gddemo.o -o gddemo	$(LIBDIRS) $(LIBS)
 
-pngtogd: pngtogd.o libgd.a
+pngtogd: pngtogd.o $(LIBGD)
 	$(CC) pngtogd.o -o pngtogd	$(LIBDIRS) $(LIBS) 
 
-webpng: webpng.o libgd.a
+webpng: webpng.o $(LIBGD)
 	$(CC) webpng.o -o webpng	$(LIBDIRS) $(LIBS)
 
-pngtogd2: pngtogd2.o libgd.a
+pngtogd2: pngtogd2.o $(LIBGD)
 	$(CC) pngtogd2.o -o pngtogd2	$(LIBDIRS) $(LIBS)
 
-gdtopng: gdtopng.o libgd.a
+gdtopng: gdtopng.o $(LIBGD)
 	$(CC) gdtopng.o -o gdtopng	$(LIBDIRS) $(LIBS)
 
-gd2topng: gd2topng.o libgd.a
+gd2topng: gd2topng.o $(LIBGD)
 	$(CC) gd2topng.o -o gd2topng	$(LIBDIRS) $(LIBS)
 
-gd2copypal: gd2copypal.o libgd.a
+gd2copypal: gd2copypal.o $(LIBGD)
 	$(CC) gd2copypal.o -o gd2copypal	$(LIBDIRS) $(LIBS)
 
-gdparttopng: gdparttopng.o libgd.a
+gdparttopng: gdparttopng.o $(LIBGD)
 	$(CC) gdparttopng.o -o gdparttopng	$(LIBDIRS) $(LIBS)
 
-gdtest: gdtest.o libgd.a
+gdtest: gdtest.o $(LIBGD)
 	$(CC) gdtest.o -o gdtest	$(LIBDIRS) $(LIBS)
 
-gd2time: gd2time.o libgd.a
+gd2time: gd2time.o $(LIBGD)
 	$(CC) gd2time.o -o gd2time	$(LIBDIRS) $(LIBS)
 
-gdtestttf: gdtestttf.o libgd.a
+gdtestttf: gdtestttf.o $(LIBGD)
 	$(CC) gdtestttf.o -o gdtestttf	$(LIBDIRS) $(LIBS)
 
-libgd.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 gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \
-	gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o  wbmp.o gd_wbmp.o \
-	gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
-	rm -f libgd.a
-	$(AR) rc libgd.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 gd_jpeg.o gdxpm.o \
-		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
+GD_OBJS= 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 gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o \
+	gdfontl.o gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o  wbmp.o \
+	gd_wbmp.o
+	
+$(LIBGD): $(GD_OBJS) gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
+	rm -f $(LIBGD)
+	$(CC) -o $(LIBGD) $(GD_OBJS:.o=.lo) -rpath ${PREFIX}/lib \
+		-version-info $(GD_MAJOR):$(GD_MINOR)
 
 clean:
-	rm -f *.o *.a ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp
-
+	$(LIBTOOL) rm -f *.o *.a ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp
