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
|
$NetBSD: patch-ah,v 1.7 2002/08/10 13:59:35 skrll Exp $
--- src/Makefile.in.orig Thu Feb 22 03:07:34 2001
+++ src/Makefile.in
@@ -87,12 +87,7 @@ TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
TROFF = @TROFF@
VERSION = @VERSION@
-CGI_LIB_DIR = $(top_srcdir)/@CGI_LIB_DIR@
-GD_LIB_DIR = $(top_srcdir)/@GD_LIB_DIR@
-PNG_LIB_DIR = $(top_srcdir)/@PNG_LIB_DIR@
-ZLIB_LIB_DIR = $(top_srcdir)/@ZLIB_LIB_DIR@
-
-INCLUDES = -I$(CGI_LIB_DIR) -I$(GD_LIB_DIR) -I$(PNG_LIB_DIR) -I$(ZLIB_LIB_DIR)
+INCLUDES = -I${PREFIX}/include
#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)
@@ -108,7 +103,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 -lintl -lX11 -lXpm
lib_LTLIBRARIES = librrd.la
@@ -123,7 +118,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
@@ -146,18 +141,12 @@ LTLIBRARIES = $(lib_LTLIBRARIES) $(noin
DEFS = @DEFS@ -I. -I$(srcdir) -I../config
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
+LIBS = @LIBS@ -ljpeg -lgd -lpng -lcgi -lz -lttf -lintl -lX11 -lXpm
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
-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_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 \
@@ -279,8 +268,8 @@ maintainer-clean-libtool:
librrd.la: $(librrd_la_OBJECTS) $(librrd_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(librrd_la_LDFLAGS) $(librrd_la_OBJECTS) $(librrd_la_LIBADD) $(LIBS)
-librrd_private.la: $(librrd_private_la_OBJECTS) $(librrd_private_la_DEPENDENCIES)
- $(LINK) $(librrd_private_la_LDFLAGS) $(librrd_private_la_OBJECTS) $(librrd_private_la_LIBADD) $(LIBS)
+librrd_private.la: $(librrd_private_la_OBJECTS)
+ $(LINK) $(librrd_private_la_LDFLAGS) $(librrd_private_la_OBJECTS) $(librrd_private_la_LIBADD) $(LIBS)
mostlyclean-binPROGRAMS:
@@ -307,7 +296,7 @@ uninstall-binPROGRAMS:
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
-rrdcgi: $(rrdcgi_OBJECTS) $(rrdcgi_DEPENDENCIES)
+rrdcgi: $(rrdcgi_OBJECTS)
@rm -f rrdcgi
$(LINK) $(rrdcgi_LDFLAGS) $(rrdcgi_OBJECTS) $(rrdcgi_LDADD) $(LIBS)
@@ -378,49 +367,6 @@ distdir: $(DISTFILES)
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
-gdpng.lo gdpng.o : gdpng.c ../libpng-1.0.9/png.h ../zlib-1.1.3/zlib.h \
- ../zlib-1.1.3/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.3/zlib.h ../zlib-1.1.3/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 \
- ../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_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
info-am:
info: info-am
|
