43 lines
2.1 KiB
Plaintext
43 lines
2.1 KiB
Plaintext
$OpenBSD: patch-src_Makefile_in,v 1.4 2001/04/06 15:04:13 danh Exp $
|
|
--- src/Makefile.in.orig Fri Apr 6 10:26:12 2001
|
|
+++ src/Makefile.in Fri Apr 6 10:27:10 2001
|
|
@@ -90,9 +90,8 @@ 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$(CGI_LIB_DIR) -I$(GD_LIB_DIR) -I$(PNG_LIB_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)
|
|
@@ -108,7 +107,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 = $(CGI_LIB_DIR)/librrd_cgi.la $(GD_LIB_DIR)/librrd_gd.la $(PNG_LIB_DIR)/librrd_png.la -lz
|
|
|
|
|
|
lib_LTLIBRARIES = librrd.la
|
|
@@ -148,16 +147,14 @@ 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
|
|
+$(GD_LIB_DIR)/librrd_gd.la $(PNG_LIB_DIR)/librrd_png.la
|
|
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
|
|
+$(GD_LIB_DIR)/librrd_gd.la $(PNG_LIB_DIR)/librrd_png.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 \
|