1 diff -Nur rrdtool-1.0.42.orig/gd1.3/Makefile.am rrdtool-1.0.42/gd1.3/Makefile.am
2 --- rrdtool-1.0.42.orig/gd1.3/Makefile.am 2003-04-04 23:23:55.000000000 +0200
3 +++ rrdtool-1.0.42/gd1.3/Makefile.am 2003-04-17 20:48:34.000000000 +0200
5 noinst_LTLIBRARIES = librrd_gd.la
7 librrd_gd_la_SOURCES = \
8 - gd.c gdfontg.c gdfontl.c gdfontmb.c \
9 - gdfonts.c gdfontt.c gdlucidab10.c gdlucidab12.c \
10 + gdlucidab10.c gdlucidab12.c \
11 gdlucidab14.c gdlucidan10.c gdlucidan12.c gdlucidan14.c \
12 gdlucidan10l2.c gdlucidab12l2.c \
13 - gd.h gdfontmb.h gdlucidab10.h gdlucidan10.h \
14 - gdfontg.h gdfonts.h gdlucidab12.h gdlucidan12.h \
15 - gdfontl.h gdfontt.h gdlucidab14.h gdlucidan14.h \
16 + gdlucidab10.h gdlucidan10.h \
17 + gdlucidab12.h gdlucidan12.h \
18 + gdlucidab14.h gdlucidan14.h \
19 gdlucidan10l2.h gdlucidab12l2.h
21 +librrd_gd_la_LIBADD = -lgd
23 EXTRA_DIST= README.rrdtool demoin.gif gd.dsp gd.dsw index.html readme.txt \
24 webgif.c mtables.c mathmake.c giftogd.c
25 diff -Nur rrdtool-1.0.42.orig/Makefile.am rrdtool-1.0.42/Makefile.am
26 --- rrdtool-1.0.42.orig/Makefile.am 2003-04-17 20:46:54.000000000 +0200
27 +++ rrdtool-1.0.42/Makefile.am 2003-04-17 20:47:27.000000000 +0200
29 RSYNC = rsync --rsh=ssh
31 # build the following subdirectories
32 -SUBDIRS = cgilib-0.4 config gd1.3 zlib-1.1.4 libpng-1.0.9 \
33 +SUBDIRS = cgilib-0.4 config gd1.3 \
34 src doc examples contrib tcl
36 # the following files are not mentioned in any other Makefile
37 diff -Nur rrdtool-1.0.42.orig/src/Makefile.am rrdtool-1.0.42/src/Makefile.am
38 --- rrdtool-1.0.42.orig/src/Makefile.am 2002-05-07 23:51:19.000000000 +0200
39 +++ rrdtool-1.0.42/src/Makefile.am 2003-04-17 20:49:49.000000000 +0200
42 CGI_INC_DIR = $(top_srcdir)/@CGI_LIB_DIR@
43 GD_INC_DIR = $(top_srcdir)/@GD_LIB_DIR@
44 -PNG_INC_DIR = $(top_srcdir)/@PNG_LIB_DIR@
45 -ZLIB_INC_DIR = $(top_srcdir)/@ZLIB_LIB_DIR@
47 CGI_LIB_DIR = $(top_builddir)/@CGI_LIB_DIR@
48 GD_LIB_DIR = $(top_builddir)/@GD_LIB_DIR@
49 -PNG_LIB_DIR = $(top_builddir)/@PNG_LIB_DIR@
50 -ZLIB_LIB_DIR = $(top_builddir)/@ZLIB_LIB_DIR@
53 -INCLUDES = -I$(CGI_INC_DIR) -I$(GD_INC_DIR) -I$(PNG_INC_DIR) -I$(ZLIB_INC_DIR)
54 +INCLUDES = -I$(CGI_INC_DIR) -I$(GD_INC_DIR)
56 #COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
57 #LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
60 $(CGI_LIB_DIR)/librrd_cgi.la \
61 $(GD_LIB_DIR)/librrd_gd.la \
62 - $(PNG_LIB_DIR)/librrd_png.la \
63 - $(ZLIB_LIB_DIR)/librrd_z.la
66 lib_LTLIBRARIES = librrd.la
67 noinst_LTLIBRARIES = librrd_private.la
68 --- rrdtool-1.0.42/perl-shared/Makefile.PL.in.orig 2002-03-21 22:52:35.000000000 +0100
69 +++ rrdtool-1.0.42/perl-shared/Makefile.PL.in 2003-04-17 21:07:29.000000000 +0200
71 # the contents of the Makefile that is written.
73 # Specify the location of the archive containing PIC compiled object files.
74 -my $librrd = "-L../src/.libs/ -lrrd_private" ;
75 +my $librrd = "-L../src/.libs/ -lrrd" ;
80 'INC' => '-I@top_srcdir@/src -I@top_srcdir@/gd1.3',
81 # where to look for the necessary libraries
82 # Perl will figure out which one is valid
83 - 'depend' => {'RRDs.c' => "../src/.libs/librrd_private.a"},
84 'dynamic_lib' => {'OTHERLDFLAGS' => "$librrd -lm"},
85 'realclean' => {FILES => 't/demo?.rrd t/demo?.gif' }
87 --- rrdtool-1.0.42/tcl/Makefile.am.orig 2002-02-26 11:21:52.000000000 +0100
88 +++ rrdtool-1.0.42/tcl/Makefile.am 2003-04-17 21:07:51.000000000 +0200
92 tclrrd$(TCL_SHLIB_SUFFIX): tclrrd.o
93 - $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ -lrrd_private -lm
94 + $(TCL_SHLIB_LD) $(LIBDIRS) $< -o $@ -lrrd -lm
97 $(CC) $(CFLAGS) $(TCL_SHLIB_CFLAGS) $(INCLUDES) -c $< -DVERSION=\"$(VERSION)\"