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
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
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
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