1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
|
$NetBSD: patch-ar,v 1.4 2003/02/16 23:08:59 seb Exp $
--- src/Makefile.in.orig Fri Oct 11 18:42:53 2002
+++ src/Makefile.in
@@ -15,6 +15,10 @@
#ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
#AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
+#COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
+#LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
+#LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA) $(LDFLAGS) -o $@
+
SHELL = @SHELL@
@@ -69,13 +73,16 @@ host_triplet = @host@
target_alias = @target_alias@
target_triplet = @target@
CC = @CC@
+CGI_LIB_DIR = @CGI_LIB_DIR@
COMP_PERL = @COMP_PERL@
CPP = @CPP@
+GD_LIB_DIR = @GD_LIB_DIR@
LIBTOOL = @LIBTOOL@
NROFF = @NROFF@
PERL = @PERL@
PERLFLAGS = @PERLFLAGS@
PERL_MAKE_OPTIONS = @PERL_MAKE_OPTIONS@
+PNG_LIB_DIR = @PNG_LIB_DIR@
RANLIB = @RANLIB@
SO_EXT = @SO_EXT@
TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@
@@ -87,22 +94,7 @@ TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
TROFF = @TROFF@
VERSION = @VERSION@
ZLIB_CFLAGS = @ZLIB_CFLAGS@
-
-CGI_INC_DIR = $(top_srcdir)/@CGI_LIB_DIR@
-GD_INC_DIR = $(top_srcdir)/@GD_LIB_DIR@
-PNG_INC_DIR = $(top_srcdir)/@PNG_LIB_DIR@
-ZLIB_INC_DIR = $(top_srcdir)/@ZLIB_LIB_DIR@
-
-CGI_LIB_DIR = $(top_builddir)/@CGI_LIB_DIR@
-GD_LIB_DIR = $(top_builddir)/@GD_LIB_DIR@
-PNG_LIB_DIR = $(top_builddir)/@PNG_LIB_DIR@
-ZLIB_LIB_DIR = $(top_builddir)/@ZLIB_LIB_DIR@
-
-INCLUDES = -I$(CGI_INC_DIR) -I$(GD_INC_DIR) -I$(PNG_INC_DIR) -I$(ZLIB_INC_DIR)
-
-#COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
-#LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
-#LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA) $(LDFLAGS) -o $@
+ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
RRD_C_FILES = gdpng.c getopt.c getopt1.c gifsize.c parsetime.c pngsize.c rrd_create.c rrd_diff.c rrd_dump.c rrd_info.c rrd_error.c rrd_fetch.c rrd_format.c rrd_graph.c rrd_last.c rrd_open.c rrd_resize.c rrd_restore.c rrd_tune.c rrd_update.c rrd_xport.c rrd_graph.h rrd_xport.h getopt.h ntconfig.h parsetime.h rrd_format.h rrd_tool.h rrd.h
@@ -114,8 +106,7 @@ RRD_C_FILES = gdpng.c getopt.c geto
# creates a ./.lib/*.al file that contains the PIC compiled object
# files.
-RRD_LIBS = $(CGI_LIB_DIR)/librrd_cgi.la $(GD_LIB_DIR)/librrd_gd.la $(PNG_LIB_DIR)/librrd_png.la $(ZLIB_LIB_DIR)/librrd_z.la
-
+RRD_LIBS = -lz -ljpeg -lgd -lcgi -lpng -lttf
lib_LTLIBRARIES = librrd.la
noinst_LTLIBRARIES = librrd_private.la
@@ -129,7 +120,7 @@ librrd_la_LDFLAGS = -version-info 0:0:0
include_HEADERS = rrd.h
librrd_private_la_LIBADD = $(RRD_LIBS)
-librrd_private_la_LDFLAGS = -static
+librrd_private_la_LDFLAGS = -prefer-pic
bin_PROGRAMS = rrdcgi rrdtool rrdupdate
@@ -153,17 +144,13 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../confi
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-librrd_la_DEPENDENCIES = $(CGI_LIB_DIR)/librrd_cgi.la \
-$(GD_LIB_DIR)/librrd_gd.la $(PNG_LIB_DIR)/librrd_png.la \
-$(ZLIB_LIB_DIR)/librrd_z.la
+librrd_la_DEPENDENCIES =
librrd_la_OBJECTS = gdpng.lo getopt.lo getopt1.lo gifsize.lo \
parsetime.lo pngsize.lo rrd_create.lo rrd_diff.lo rrd_dump.lo \
rrd_info.lo rrd_error.lo rrd_fetch.lo rrd_format.lo rrd_graph.lo \
rrd_last.lo rrd_open.lo rrd_resize.lo rrd_restore.lo rrd_tune.lo \
rrd_update.lo rrd_xport.lo
-librrd_private_la_DEPENDENCIES = $(CGI_LIB_DIR)/librrd_cgi.la \
-$(GD_LIB_DIR)/librrd_gd.la $(PNG_LIB_DIR)/librrd_png.la \
-$(ZLIB_LIB_DIR)/librrd_z.la
+librrd_private_la_DEPENDENCIES =
librrd_private_la_OBJECTS = gdpng.lo getopt.lo getopt1.lo gifsize.lo \
parsetime.lo pngsize.lo rrd_create.lo rrd_diff.lo rrd_dump.lo \
rrd_info.lo rrd_error.lo rrd_fetch.lo rrd_format.lo rrd_graph.lo \
@@ -194,7 +181,7 @@ PACKAGE = @PACKAGE@
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = gtar
+TAR = tar
GZIP_ENV = --best
SOURCES = $(librrd_la_SOURCES) $(librrd_private_la_SOURCES) $(rrdcgi_SOURCES) $(rrdtool_SOURCES) $(rrdupdate_SOURCES)
OBJECTS = $(librrd_la_OBJECTS) $(librrd_private_la_OBJECTS) $(rrdcgi_OBJECTS) $(rrdtool_OBJECTS) $(rrdupdate_OBJECTS)
@@ -203,7 +190,7 @@ all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
+ cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
@@ -377,60 +364,13 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
-gdpng.lo gdpng.o : gdpng.c ../libpng-1.0.9/png.h ../zlib-1.1.4/zlib.h \
- ../zlib-1.1.4/zconf.h ../libpng-1.0.9/pngconf.h ../gd1.3/gd.h
-getopt.lo getopt.o : getopt.c ../config/config.h getopt.h
-getopt1.lo getopt1.o : getopt1.c ../config/config.h getopt.h
-gifsize.lo gifsize.o : gifsize.c
-parsetime.lo parsetime.o : parsetime.c rrd_tool.h ../config/config.h \
- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-pngsize.lo pngsize.o : pngsize.c ../libpng-1.0.9/png.h \
- ../zlib-1.1.4/zlib.h ../zlib-1.1.4/zconf.h \
- ../libpng-1.0.9/pngconf.h
-rrd_cgi.o: rrd_cgi.c rrd_tool.h ../config/config.h rrd.h getopt.h \
- rrd_format.h ../gd1.3/gd.h ../cgilib-0.4/cgi.h
-rrd_create.lo rrd_create.o : rrd_create.c rrd_tool.h ../config/config.h \
- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-rrd_diff.lo rrd_diff.o : rrd_diff.c rrd_tool.h ../config/config.h rrd.h \
- getopt.h rrd_format.h ../gd1.3/gd.h
-rrd_dump.lo rrd_dump.o : rrd_dump.c rrd_tool.h ../config/config.h rrd.h \
- getopt.h rrd_format.h ../gd1.3/gd.h
-rrd_error.lo rrd_error.o : rrd_error.c rrd_tool.h ../config/config.h \
- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-rrd_fetch.lo rrd_fetch.o : rrd_fetch.c rrd_tool.h ../config/config.h \
- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-rrd_format.lo rrd_format.o : rrd_format.c rrd_tool.h ../config/config.h \
- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-rrd_graph.lo rrd_graph.o : rrd_graph.c rrd_tool.h ../config/config.h \
- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h rrd_graph.h \
- ../gd1.3/gdlucidan10.h ../gd1.3/gdlucidab12.h
-rrd_info.lo rrd_info.o : rrd_info.c rrd_tool.h ../config/config.h rrd.h \
- getopt.h rrd_format.h ../gd1.3/gd.h
-rrd_last.lo rrd_last.o : rrd_last.c rrd_tool.h ../config/config.h rrd.h \
- getopt.h rrd_format.h ../gd1.3/gd.h
-rrd_open.lo rrd_open.o : rrd_open.c rrd_tool.h ../config/config.h rrd.h \
- getopt.h rrd_format.h ../gd1.3/gd.h
-rrd_resize.lo rrd_resize.o : rrd_resize.c rrd_tool.h ../config/config.h \
- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-rrd_restore.lo rrd_restore.o : rrd_restore.c rrd_tool.h \
- ../config/config.h rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-rrd_tool.o: rrd_tool.c rrd_tool.h ../config/config.h rrd.h getopt.h \
- rrd_format.h ../gd1.3/gd.h rrd_xport.h
-rrd_tune.lo rrd_tune.o : rrd_tune.c rrd_tool.h ../config/config.h rrd.h \
- getopt.h rrd_format.h ../gd1.3/gd.h
-rrd_update.lo rrd_update.o : rrd_update.c rrd_tool.h ../config/config.h \
- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h
-rrd_xport.lo rrd_xport.o : rrd_xport.c rrd_tool.h ../config/config.h \
- rrd.h getopt.h rrd_format.h ../gd1.3/gd.h rrd_graph.h \
- rrd_xport.h
-
info-am:
info: info-am
dvi-am:
|
