$NetBSD: patch-aa,v 1.5 1999/11/01 03:29:30 jlam Exp $

--- Makefile.orig	Wed Oct 13 17:20:11 1999
+++ Makefile	Sat Oct 30 23:28:34 1999
@@ -11,27 +11,27 @@
 
 #If the install command is not in your path, provide
 #an explicit path for it here, or install manually.
-INSTALL=install
+INSTALL=$(LIBTOOL) install -c
 
 #If you don't have FreeType and/or Xpm installed, including the
 #header files, uncomment this (default).
-CFLAGS=-O
+#CFLAGS=-O
 #If you do have FreeType 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_LIBTTF
+CFLAGS+=-O -DHAVE_XPM -DHAVE_LIBTTF
 
 #If you don't have FreeType and/or Xpm fully installed, uncomment this
 #(default).
-LIBS=-lm -lgd -lpng -lz
+#LIBS=-lm -lgd -lpng -lz
 
 #If you do have FreeType and/or Xpm fully installed, uncomment a 
 #variation of this and comment out the line above. Note that
 #Xpm requires X11. See also CFLAGS above.
-#LIBS=-lm -lgd -lpng -lz -lttf -lXpm -lX11
+LIBS=$(LIBGD) -lm -lpng -lz -lttf -lintl -lXpm -lX11
 
 #Typical install locations for freetype, zlib, xpm and libpng header files.
 #If yours are somewhere else, change this. 
-INCLUDEDIRS=-I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11
+INCLUDEDIRS=${CPPFLAGS}
 
 #Typical install locations for freetype, zlib, xpm and libpng libraries.
 #If yours are somewhere else, other than a standard location
@@ -39,16 +39,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
 
 #
 #
@@ -58,7 +58,7 @@
 
 VERSION=1.7
 
-CC=$(COMPILER) $(INCLUDEDIRS)
+CC=$(LIBTOOL) $(COMPILER) $(INCLUDEDIRS)
 LINK=$(CC) $(LIBDIRS) $(LIBS)
 
 PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS)
@@ -66,10 +66,12 @@
 BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
 TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf
 
-all: libgd.a $(PROGRAMS)
+LIBGD=libgd.la
 
-install: libgd.a $(BIN_PROGRAMS)
-	$(INSTALL) -m 644 libgd.a $(INSTALL_LIB)/libgd.a
+all: $(LIBGD) $(PROGRAMS)
+
+install: $(LIBGD) $(BIN_PROGRAMS)
+	$(INSTALL) -m 644 $(LIBGD) $(INSTALL_LIB)
 	$(INSTALL) -m 755 pngtogd $(INSTALL_BIN)/pngtogd
 	$(INSTALL) -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2
 	$(INSTALL) -m 755 gdtopng $(INSTALL_BIN)/gdtopng
@@ -87,50 +89,47 @@
 	$(INSTALL) -m 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h
 	$(INSTALL) -m 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_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 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
-	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 gdxpm.o \
-		gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \
-		gdtables.o gdttf.o gdcache.o gdkanji.o
-	-ranlib libgd.a
+	gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o
 
-clean:
-	rm -f *.o *.a ${PROGRAMS}
+$(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:
+	$(LIBTOOL) rm -f *.o *.a ${PROGRAMS}
