diff -ur nessus-core.orig/nessus/gdchart0.94b/makefile nessus-core/nessus/gdchart0.94b/makefile
--- nessus-core.orig/nessus/gdchart0.94b/makefile 2002-09-10 09:32:55.000000000 +0200
+++ nessus-core/nessus/gdchart0.94b/makefile 2005-07-03 16:04:50.000000000 +0200
@@ -1,27 +1,27 @@
include ../../nessus.tmpl
GDC_INCL = .
-GD_INCL = gd1.3
-GD_LIB = gd1.3
+GD_INCL = /usr/include
+GD_LIB = /usr/lib
IINCL = $(CFLAGS) `sh ../cflags`
-all: gdc.o gdchart.o price_conv.o gdc_pie.o $(GD_LIB)/libgd.a
+all: gdc.o gdchart.o price_conv.o gdc_pie.o
# compile the samples
-gdc_samp1: gdc.o gdchart.o price_conv.o gdc_samp1.o $(GD_LIB)/libgd.a
+gdc_samp1: gdc.o gdchart.o price_conv.o gdc_samp1.o
$(CC) -o gdc_samp1 gdc.o gdchart.o price_conv.o gdc_samp1.o -L$(GD_LIB) -lgd -lm
gdc_samp1.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdc_samp1.c
$(CC) $(IINCL) -I$(GDC_INCL) -c gdc_samp1.c
-gdc_samp2: gdc.o gdchart.o price_conv.o gdc_samp2.o $(GD_LIB)/libgd.a
+gdc_samp2: gdc.o gdchart.o price_conv.o gdc_samp2.o
$(CC) $(IINCL) -o gdc_samp2 gdc.o gdchart.o price_conv.o gdc_samp2.o -L$(GD_LIB) -lgd -lm
gdc_samp2.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdc_samp2.c
$(CC) $(IINCL) -I$(GDC_INCL) -c gdc_samp2.c
-gdc_pie_samp: gdc.o gdc_pie.o price_conv.o gdc_pie_samp.o $(GD_LIB)/libgd.a
+gdc_pie_samp: gdc.o gdc_pie.o price_conv.o gdc_pie_samp.o
$(CC) $(IINCL) -o gdc_pie_samp gdc.o gdc_pie.o price_conv.o gdc_pie_samp.o -L$(GD_LIB) -lgd -lm
gdc_pie_samp.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdcpie.h gdc_pie_samp.c
@@ -40,11 +40,7 @@
gdchart.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdchart.c
$(CC) $(IINCL) -I$(GD_INCL) -I$(GDC_INCL) -c gdchart.c
-$(GD_LIB)/libgd.a:
- cd $(GD_LIB) ; $(MAKE) -f Makefile libgd.a
-
# --- clean ---
clean:
rm -f *.o gdc_samp1 gdc_samp2 gdc_pie_samp
- cd $(GD_LIB) ; $(MAKE) -f Makefile clean
diff -ur nessus-core.orig/nessus/Makefile nessus-core/nessus/Makefile
--- nessus-core.orig/nessus/Makefile 2003-02-22 14:47:43.000000000 +0100
+++ nessus-core/nessus/Makefile 2005-07-03 16:18:55.000000000 +0200
@@ -1,9 +1,9 @@
include ../nessus.tmpl
GTKLIBS= $(GTKCONFIG_LIBS) $(GLIBCONFIG_LIBS)
-INCLUDE = ${include} $(GTKCONFIG_CFLAGS) $(GLIBCONFIG_CFLAGS) -Igdchart0.94b -Igdchart0.94b/gd1.3
+INCLUDE = ${include} $(GTKCONFIG_CFLAGS) $(GLIBCONFIG_CFLAGS) -Igdchart0.94b
LIBS = `$(NESSUSCONFIG) --libs` $(X_LIBS) $(X_CFLAGS) $(GTKLIBS) \
- $(RUN_LIBS) $(C_R_LIB) gdchart0.94b/gd1.3/libgd.a -lm
+ $(RUN_LIBS) $(C_R_LIB) -lgd -lm
NESSUS_INCLUDE=`sh ./cflags`
