a patch to avoid a memory leak and a Makefile.am patch to

[rrdtool.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9e64c24..75a29d5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@
 #
 #ACLOCAL_M4       = $(top_srcdir)/config/aclocal.m4
 #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
-
+DEFS += -DMAKE_TIMESTAMP=\""$(shell date)"\"
 if USE_INSTALLED_libcgi
 CGI_LIB           = -lcgi
 else
@@ -63,10 +63,14 @@ RRD_C_FILES =               \
        rrd_tune.c      \
        rrd_update.c    \
        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_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
@@ -82,15 +86,20 @@ RRD_LIBS =                          \
        $(PNG_LIB)      \
        $(ZLIB_LIB)
 
-lib_LTLIBRARIES           = librrd.la
+lib_LTLIBRARIES           = librrd.la librrd_th.la
 noinst_LTLIBRARIES        = librrd_private.la
 
-librrd_la_SOURCES         = $(RRD_C_FILES)
-librrd_private_la_SOURCES = $(RRD_C_FILES)
+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_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_LIBADD          = $(RRD_LIBS) -lpthread
+librrd_th_la_LDFLAGS         = -version-info 1:2:0
+
+
 include_HEADERS        = rrd.h
 
 librrd_private_la_LIBADD  = $(RRD_LIBS)
@@ -104,14 +113,14 @@ rrdcgi_LDADD      = librrd.la
 rrdupdate_SOURCES = 
 rrdupdate_LDADD        = rrdupdate.o librrd.la
 
-
 rrdupdate.c: rrd_update.c
        -ln -s rrd_update.c rrdupdate.c
 
 rrdupdate.o: rrdupdate.c
        $(COMPILE) -DSTANDALONE -c rrdupdate.c
 
-rrdtool_SOURCES        = rrd_tool.c
+rrdtool_SOURCES = 
+rrdtool_DEPENDENCIES = rrd_tool.o
 rrdtool_LDADD  = librrd.la
 
 EXTRA_DIST= rrdtool.dsp rrdtool.dsw