X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=58b71c19f7843b4f1caaa34575676b54e4962ada;hb=c5282fa77324d86f882cfda15f43b62d2b1f8bc2;hp=f7965b15e2324ec1f62342ca11d37a3e244ebbdb;hpb=298b318acaf1147474ab9e97cac37c3608660efd;p=rrdtool.git

diff --git a/src/Makefile.am b/src/Makefile.am
index f7965b1..58b71c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,35 +4,35 @@
 #
 #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
-CGI_LIB	           = $(top_srcdir)/libraries/@CGI_LIB_DIR@/librrd_cgi.la
+CGI_LIB	           = $(top_builddir)/libraries/@CGI_LIB_DIR@/librrd_cgi.la
 CGI_INCLUDES       = -I$(top_srcdir)/libraries/@CGI_LIB_DIR@
 endif
 if USE_INSTALLED_libfreetype
 FREETYPE_LIB       = -lfreetype
 else
-FREETYPE_LIB       = $(top_srcdir)/libraries/@FREETYPE_LIB_DIR@/librrd_freetype.la
+FREETYPE_LIB       = $(top_builddir)/libraries/@FREETYPE_LIB_DIR@/librrd_freetype.la
 FREETYPE_INCLUDES  = -I$(top_srcdir)/libraries/@FREETYPE_LIB_DIR@/include
 endif
 if USE_INSTALLED_libart_lgpl
 ART_LIB            = -lart_lgpl
 else
-ART_LIB 	   = $(top_srcdir)/libraries/@ART_LIB_DIR@/librrd_art.la
-ART_INCLUDES       = -I$(top_srcdir)/libraries/@ART_LIB_DIR@
+ART_LIB 	   = $(top_builddir)/libraries/@ART_LIB_DIR@/librrd_art.la
+ART_INCLUDES       = -I$(top_srcdir)/libraries/@ART_LIB_DIR@ -I$(top_builddir)/libraries/@ART_LIB_DIR@
 endif
 if USE_INSTALLED_libpng
 PNG_LIB            = -lpng
 else
-PNG_LIB		   = $(top_srcdir)/libraries/@PNG_LIB_DIR@/librrd_png.la
+PNG_LIB		   = $(top_builddir)/libraries/@PNG_LIB_DIR@/librrd_png.la
 PNG_INCLUDES       = -I$(top_srcdir)/libraries/@PNG_LIB_DIR@
 endif
 if USE_INSTALLED_libz
 ZLIB_LIB           = -lz
 else
-ZLIB_LIB           = $(top_srcdir)/libraries/@ZLIB_LIB_DIR@/librrd_z.la
+ZLIB_LIB           = $(top_builddir)/libraries/@ZLIB_LIB_DIR@/librrd_z.la
 ZLIB_INCLUDES      = -I$(top_srcdir)/libraries/@ZLIB_LIB_DIR@
 endif
 
@@ -68,7 +68,9 @@ RRD_C_FILES =		\
 	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_nan_inf.h fnv.h rrd_graph.h rrd_afm.h rrd_afm_data.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
@@ -88,7 +90,7 @@ lib_LTLIBRARIES           = librrd.la librrd_th.la
 noinst_LTLIBRARIES        = librrd_private.la
 
 librrd_la_SOURCES         = $(RRD_C_FILES) rrd_not_thread_safe.c
-librrd_private_la_SOURCES = $(RRD_C_FILES)
+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
@@ -111,14 +113,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