X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=58b71c19f7843b4f1caaa34575676b54e4962ada;hb=88ec7a41d5ba332d0a902a17c0ef0cb01d133a30;hp=4a93f32f275e52b61b330ea177b8074f3c7a7b86;hpb=8e13243ff468f7c8ccb3b682e6ef2f1ee4a48990;p=rrdtool.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 4a93f32..58b71c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,31 +8,31 @@ 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
 
@@ -69,7 +69,8 @@ RRD_C_FILES =		\
 	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_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
@@ -112,11 +113,11 @@ 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.c: rrd_update.c
+#	-ln -s ${srcdir}/rrdupdate.c rrd_update.c
 
-rrdupdate.o: rrdupdate.c
-	$(COMPILE) -DSTANDALONE -c rrdupdate.c
+rrdupdate.o: rrd_update.c
+	$(COMPILE) -DSTANDALONE -c -o $@ $^
 
 rrdtool_SOURCES = 
 rrdtool_DEPENDENCIES = rrd_tool.o