X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2FMakefile.am;h=eb027a3797dbe95627ab37747ba05979e817ce16;hp=875c007d999f1a437a9071a87ae190e539e11327;hb=abc44fe218aab32a0bca8fab2fe9a864a0671cac;hpb=5837606887a6d81e8b1f7588525cb1c8783fb62b

diff --git a/src/Makefile.am b/src/Makefile.am
index 875c007..eb027a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,24 +4,17 @@
 #
 #ACLOCAL_M4	   = $(top_srcdir)/config/aclocal.m4
 #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
+DEFS += -DMAKE_TIMESTAMP=\""$(shell date)"\"
 
-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)
-
-#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 $@
+#INCLUDES = $(CGI_INCLUDES) $(FREETYPE_INCLUDES) $(ART_INCLUDES) \
+#           $(PNG_INCLUDES) $(ZLIB_INCLUDES)
 
 RRD_C_FILES =		\
-	gdpng.c		\
 	getopt.c	\
 	getopt1.c	\
-	gifsize.c	\
 	parsetime.c	\
+	hash_32.c	\
+	rrd_hw.c	\
 	pngsize.c	\
 	rrd_create.c	\
 	rrd_diff.c	\
@@ -31,42 +24,51 @@ RRD_C_FILES =		\
 	rrd_fetch.c	\
 	rrd_format.c	\
 	rrd_graph.c	\
+	rrd_graph_helper.c	\
 	rrd_last.c	\
 	rrd_open.c	\
 	rrd_resize.c	\
 	rrd_restore.c	\
+	rrd_rpncalc.c \
 	rrd_tune.c	\
 	rrd_update.c	\
-	getopt.h ntconfig.h parsetime.h rrd_format.h rrd_tool.h rrd.h
+	rrd_xport.c	\
+	rrd_nan_inf.c	\
+	rrd_gfx.c rrd_gfx.h \
+	rrd_afm.c rrd_afm_data.c \
+	getopt.h ntconfig.h parsetime.h \
+	rrd_format.h rrd_tool.h rrd_xport.h rrd.h rrd_hw.h rrd_rpncalc.h \
+	rrd_tool.c \
+	rrd_nan_inf.h fnv.h rrd_graph.h rrd_afm.h rrd_afm_data.h \
+	rrd_is_thread_safe.h
 
-# Build two libraries.  One is a public one that gets installed in
-# $prefix/lib.  Libtool does not create an archive of the PIC compiled
-# objects for this library type.  The second library is a private one
-# meant to build the RRDs.so for perl-shared.  In this case libtool
-# creates a ./.lib/*.al file that contains the PIC compiled object
-# files.
+lib_LTLIBRARIES           = librrd.la 
+if BUILD_MULTITHREAD
+lib_LTLIBRARIES           += librrd_th.la
+endif
 
-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
+#noinst_LTLIBRARIES        = librrd_private.la
 
-lib_LTLIBRARIES           = librrd.la
-noinst_LTLIBRARIES        = librrd_private.la
+librrd_la_SOURCES         = $(RRD_C_FILES) rrd_not_thread_safe.c
+#librrd_private_la_SOURCES = $(RRD_C_FILES) rrd_not_thread_safe.c
 
-librrd_la_SOURCES         = $(RRD_C_FILES)
-librrd_private_la_SOURCES = $(RRD_C_FILES)
+# librrd_la_LIBADD          = $(RRD_LIBS)
+librrd_la_LDFLAGS         = -version-info 1:2:0
+
+librrd_th_la_SOURCES         = $(RRD_C_FILES) rrd_thread_safe.c
+librrd_th_la_CFLAGS          = $(MULTITHREAD_CFLAGS)
+librrd_th_la_LDFLAGS         = $(MULTITHREAD_LDFLAGS) -version-info 1:2:0
 
-librrd_la_LIBADD          = $(RRD_LIBS)
-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_LIBADD  = $(RRD_LIBS)
+#librrd_private_la_LDFLAGS = -static
 
-bin_PROGRAMS	= rrdcgi rrdtool rrdupdate
+bin_PROGRAMS	= rrdtool rrdupdate
+if BUILD_RRDCGI
+bin_PROGRAMS += rrdcgi
+endif
 
 rrdcgi_SOURCES	= rrd_cgi.c
 rrdcgi_LDADD	= librrd.la
@@ -74,14 +76,14 @@ rrdcgi_LDADD	= librrd.la
 rrdupdate_SOURCES = 
 rrdupdate_LDADD	= rrdupdate.o librrd.la
 
+# rrdupdate.c: rrd_update.c
+#	-ln -s ${srcdir}/rrdupdate.c rrd_update.c
 
-rrdupdate.c: rrd_update.c
-	-ln -s rrd_update.c rrdupdate.c
-
-rrdupdate.o: rrdupdate.c
-	$(COMPILE) -DSTANDALONE -c rrdupdate.c
+rrdupdate.o: rrd_update.c
+	$(COMPILE) -DSTANDALONE -c -o $@ $^
 
-rrdtool_SOURCES	= rrd_tool.c
+rrdtool_SOURCES = 
+rrdtool_DEPENDENCIES = rrd_tool.o
 rrdtool_LDADD	= librrd.la
 
 EXTRA_DIST= rrdtool.dsp rrdtool.dsw