$NetBSD: patch-ac,v 1.6 2003/06/24 08:04:24 adam Exp $

--- makefile.orig	Tue Mar 11 04:03:06 2003
+++ makefile
@@ -1,4 +1,4 @@
-CC=gcc
+LIB_OBJS= gifencode.o price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o
 # gcc 2.7.1 or better is required
 # CFLAGS=
 # CFLAGS=-g -ansi -pedantic
@@ -6,11 +6,11 @@ CC=gcc
 # ----- build path -----
 GDC_INCL=./
 GDC_LD=./
-GDC_LIB=libgdc.a
+GDC_LIB=libgdchart.a
 
 # ----- install locations -----
-PREFIX_INC = /usr/local/include
-PREFIX_LIB = /usr/local/lib
+PREFIX_INC = ${PREFIX}/include
+PREFIX_LIB = ${PREFIX}/lib
 
 # INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include 
 
@@ -18,9 +18,9 @@ PREFIX_LIB = /usr/local/lib
 # GDChart requires the gd library - www.boutell.com/gd/
 # libgd 1.8.4 or better is required.  Don't use 2.0.0
 # if it's not installed in a standard location edit these lines for your installation
-GD_INCL=../gd-1.8.4/
-GD_LD=../gd-1.8.4/
-GD_LIB=libgd.a
+GD_INCL=${BUILDLINK_PREFIX.gd}/include/
+GD_LD=${BUILDLINK_PREFIX.gd}/lib/
+GD_LIB=libgd.so
 # if you're using gd2.x, use these lines
 # (it's typically built as a shared lib)
 # GD_INCL  = ../gd-2.0.0/
@@ -66,73 +66,72 @@ LIB_PATHS   = -L$(GD_LD) -L$(GDC_LD)
 # LIB_PATHS = $(LIB_PATHS) -Xlinker -rpath -Xlinker $(PNG_LD) -Xlinker -rpath -Xlinker $(ZLIB_LD)
 
 
-all: libgdc.a gdc_samp1 gdc_samp2 gdc_pie_samp ft_samp
+all: libgdchart.a
 
 # --- compile the samples ---
 gdc_pie_samp.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdcpie.h gdc_pie_samp.c
-	$(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c gdc_pie_samp.c
+	${LIBTOOL} $(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c gdc_pie_samp.c
 
 gdc_samp1.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdchart.h gdc_samp1.c
-	$(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c gdc_samp1.c
+	${LIBTOOL} $(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c gdc_samp1.c
 
 gdc_samp2.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdchart.h gdc_samp2.c
-	$(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c gdc_samp2.c
+	${LIBTOOL} $(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c gdc_samp2.c
 
 ft_samp.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdchart.h ft_samp.c
-	$(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c ft_samp.c
+	${LIBTOOL} $(CC) $(CFLAGS) -I$(GDC_INCL) $(DEFS) -c ft_samp.c
 
 # --- link the samples ---
 gdc_samp1: $(GDC_LD)libgdc.a gdc_samp1.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
-	$(CC) -o gdc_samp1 \
+	${LIBTOOL} $(CC) -o gdc_samp1 \
 			 gdc_samp1.o \
 			 $(LIB_PATHS) \
-			 -lgdc -lgd -lz -lpng $(LIBS) -lm
+			 -lgdchart -lgd -lz -lpng $(LIBS) -lm
 
 gdc_samp2: $(GDC_LD)libgdc.a gdc_samp2.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
-	$(CC) -o gdc_samp2 \
+	${LIBTOOL} $(CC) -o gdc_samp2 \
 			 gdc.o gdchart.o price_conv.o gifencode.o \
 			 gdc_samp2.o \
 			 $(LIB_PATHS) \
-			 -lgdc -lgd -lz -lpng $(LIBS) -lm
+			 -lgdchart -lgd -lz -lpng $(LIBS) -lm
 
 gdc_pie_samp: $(GDC_LD)libgdc.a gdc_pie_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
-	$(CC) -o gdc_pie_samp \
+	${LIBTOOL} $(CC) -o gdc_pie_samp \
 			 gdc.o gdc_pie.o price_conv.o gifencode.o \
 			 gdc_pie_samp.o \
 			 $(LIB_PATHS) \
-			 -lgdc -lgd -lz -lpng $(LIBS) -lm
+			 -lgdchart -lgd -lz -lpng $(LIBS) -lm
 
 ft_samp: $(GDC_LD)libgdc.a ft_samp.o $(GD_LD)/$(GD_LIB) $(GDC_LD)/$(GDC_LIB)
-	$(CC) -o ft_samp \
+	${LIBTOOL} $(CC) -o ft_samp \
 			 gdc.o gdchart.o price_conv.o gifencode.o \
 			 ft_samp.o \
 			 $(LIB_PATHS) \
-			 -lgdc -lgd -lz -lpng $(LIBS) -lm
+			 -lgdchart -lgd -lz -lpng $(LIBS) -lm
 
 # --- compile the lib ---
 gdc.h: $(GD_INCL)gd.h $(GD_INCL)gdfonts.h $(GD_INCL)gdfontt.h $(GD_INCL)gdfontmb.h $(GD_INCL)gdfontg.h $(GD_INCL)gdfontl.h $(GDC_INCL)gifencode.h $(GDC_INCL)array_alloc.h
 
 gifencode.o: gifencode.c gifencode.h $(GDC_INCL)gdc.h
-	$(CC) $(CFLAGS) -I$(GD_INCL) -c gifencode.c
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -c gifencode.c
 
 price_conv.o: price_conv.c
-	$(CC) $(CFLAGS) -c price_conv.c
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c price_conv.c
 
 gdc.o: gdc.c $(GDC_INCL)gdc.h
-	$(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc.c
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc.c
 
 gdc_pie.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdcpie.h gdc_pie.c
-	$(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc_pie.c
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdc_pie.c
 
 gdchart.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdchart.h gdchart.c
-	$(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdchart.c
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I$(GD_INCL) -I$(GDC_INCL) $(DEFS) -c gdchart.c
 
 array_alloc.o: array_alloc.c array_alloc.h
-	$(CC) $(CFLAGS) -c array_alloc.c
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c array_alloc.c
 
-libgdc.a: gifencode.o price_conv.o gdc.o gdc_pie.o gdchart.o array_alloc.o
-	ar cr libgdc.a gdc.o gdchart.o gdc_pie.o price_conv.o gifencode.o array_alloc.o
-	ranlib libgdc.a
+libgdchart.a: $(LIB_OBJS)
+	$(LIBTOOL) --mode=link $(CC) -o libgdchart.la $(LIB_OBJS:.o=.lo) -L${GD_LD} -lgd -version-info 0:11 -rpath $(PREFIX)/lib
 
 # --- supporting libraries ---
 # should be compile & installed separately
@@ -140,9 +139,9 @@ libgdc.a: gifencode.o price_conv.o gdc.o
 # 	cd $(GD_LD) ; make -f Makefile $(GD_LIB)
 
 # ----- install -----
-install: gdc.h gdchart.h gdcpie.h gifencode.h libgdc.a
+install: gdc.h gdchart.h gdcpie.h gifencode.h libgdchart.a
 	cp gdc.h  gdchart.h  gdcpie.h  gifencode.h $(PREFIX_INC)/
-	cp libgdc.a $(PREFIX_LIB)/
+	$(LIBTOOL) --mode=install ${BSD_INSTALL_DATA} libgdchart.la ${PREFIX}/lib
 
 # --- clean ---
 clean: