--- gdchart0.11.5dev/Makefile.orig	Tue Mar 11 04:03:06 2003
+++ gdchart0.11.5dev/Makefile	Wed Jul  2 13:53:07 2003
@@ -6,11 +6,11 @@
 # ----- build path -----
 GDC_INCL=./
 GDC_LD=./
-GDC_LIB=libgdc.a
+GDC_LIB=libgdc.la
 
 # ----- install locations -----
-PREFIX_INC = /usr/local/include
-PREFIX_LIB = /usr/local/lib
+PREFIX_INC = /usr/include
+PREFIX_LIB = /usr/lib
 
 # INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include 
 
@@ -18,9 +18,9 @@
 # GDChart requires the gd library - www.boutell.com/gd/
 # gd 2.0.28 or better is required (GIF support has returned to libgd)
 # if it's not installed in a standard location edit these lines for your installation
-GD_INCL=/usr/local/include/
-GD_LD=/usr/local/lib/
-GD_LIB=libgd.so
+GD_INCL=/usr/include/
+GD_LD=/usr/lib/
+GD_LIB=-lgd
 # a static libgd is also available
 # GD_LIB=libgd.a
 
@@ -66,7 +65,7 @@
 # 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: libgdc.la gdc_samp1 gdc_samp2 gdc_pie_samp ft_samp
 
 # --- compile the samples ---
 gdc_pie_samp.o: $(GDC_INCL)gdc.h $(GDC_INCL)gdcpie.h gdc_pie_samp.c
@@ -79,54 +79,51 @@
 	$(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 \
+gdc_samp1: $(GDC_LD)libgdc.la gdc_samp1.o
+	libtool --mode=link $(CC) -o gdc_samp1 \
 			 gdc_samp1.o \
 			 $(LIB_PATHS) \
-			 -lgdc -lgd -lz -lpng $(LIBS) -lm
+			 libgdc.la -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 \
-			 gdc.o gdchart.o price_conv.o \
+gdc_samp2: $(GDC_LD)libgdc.la gdc_samp2.o
+	libtool --mode=link $(CC) -o gdc_samp2 \
 			 gdc_samp2.o \
 			 $(LIB_PATHS) \
-			 -lgdc -lgd -lz -lpng $(LIBS) -lm
+			 libgdc.la -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 \
-			 gdc.o gdc_pie.o price_conv.o \
+gdc_pie_samp: $(GDC_LD)libgdc.la gdc_pie_samp.o
+	libtool --mode=link $(CC) -o gdc_pie_samp \
 			 gdc_pie_samp.o \
 			 $(LIB_PATHS) \
-			 -lgdc -lgd -lz -lpng $(LIBS) -lm
+			 libgdc.la -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 \
-			 gdc.o gdchart.o price_conv.o \
+ft_samp: $(GDC_LD)libgdc.la ft_samp.o
+	libtool --mode=link $(CC) -o ft_samp \
 			 ft_samp.o \
 			 $(LIB_PATHS) \
-			 -lgdc -lgd -lz -lpng $(LIBS) -lm
+			 libgdc.la -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)array_alloc.h
+gdc.h: $(GDC_INCL)array_alloc.h
 
-price_conv.o: price_conv.c
-	$(CC) $(CFLAGS) -c price_conv.c
+price_conv.lo: 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
+gdc.lo: gdc.c $(GDC_INCL)gdc.h
+	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
+gdc_pie.lo: $(GDC_INCL)gdc.h $(GDC_INCL)gdcpie.h 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
+gdchart.lo: $(GDC_INCL)gdc.h $(GDC_INCL)gdchart.h 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
+array_alloc.lo: array_alloc.c array_alloc.h
+	libtool --mode=compile $(CC) $(CFLAGS) -c array_alloc.c
 
-libgdc.a: 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 array_alloc.o
-	ranlib libgdc.a
+libgdc.la: price_conv.lo gdc.lo gdc_pie.lo gdchart.lo array_alloc.lo
+	libtool --mode=link $(CC) $(LDFLAGS) -o libgdc.la -rpath $(PREFIX_LIB) -lgd \
+	gdc.lo gdchart.lo gdc_pie.lo price_conv.lo array_alloc.lo
 
 # --- supporting libraries ---
 # should be compile & installed separately
@@ -134,11 +131,12 @@
 # 	cd $(GD_LD) ; make -f Makefile $(GD_LIB)
 
 # ----- install -----
-install: gdc.h gdchart.h gdcpie.h libgdc.a
-	cp gdc.h  gdchart.h  gdcpie.h $(PREFIX_INC)/
-	cp libgdc.a $(PREFIX_LIB)/
+install: gdc.h gdchart.h gdcpie.h libgdc.la
+	install -d $(DESTDIR)$(PREFIX_INC) $(DESTDIR)$(PREFIX_LIB)
+	cp gdc.h  gdchart.h  gdcpie.h  $(DESTDIR)$(PREFIX_INC)
+	libtool --mode=install install libgdc.la $(DESTDIR)$(PREFIX_LIB)
 
 # --- clean ---
 clean:
-	rm -f *.o *.a gdc_samp1 gdc_samp2 gdc_pie_samp ft_samp
+	rm -f *.lo *.la gdc_samp1 gdc_samp2 gdc_pie_samp ft_samp