diff --git a/src/Makefile.am b/src/Makefile.am
index 74d382f3962e7fd8555f982f471f711423d25a29..f0a544853135b1c207513caff39a309e537f32c4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
INCLUDES = -DLOCALEDIR="\"$(datadir)/locale\""
RRD_DEFAULT_FONT=@RRD_DEFAULT_FONT@
AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\" -DNUMVERS=@NUMVERS@
INCLUDES = -DLOCALEDIR="\"$(datadir)/locale\""
RRD_DEFAULT_FONT=@RRD_DEFAULT_FONT@
AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\" -DNUMVERS=@NUMVERS@
+AM_CFLAGS = @CFLAGS@
+## no including this by default @WERROR@
UPD_C_FILES = \
UPD_C_FILES = \
+ rrd_create.c \
+ hash_32.c \
rrd_parsetime.c \
rrd_hw.c \
rrd_hw_math.c \
rrd_parsetime.c \
rrd_hw.c \
rrd_hw_math.c \
rrd_info.c \
rrd_error.c \
rrd_open.c \
rrd_info.c \
rrd_error.c \
rrd_open.c \
+ rrd_client.c \
rrd_nan_inf.c \
rrd_rpncalc.c \
rrd_nan_inf.c \
rrd_rpncalc.c \
+ rrd_utils.c \
rrd_update.c
RRD_C_FILES = \
rrd_update.c
RRD_C_FILES = \
- hash_32.c \
- pngsize.c \
- rrd_create.c \
- rrd_graph.c \
- rrd_graph_helper.c \
rrd_version.c \
rrd_last.c \
rrd_lastupdate.c \
rrd_first.c \
rrd_restore.c \
rrd_version.c \
rrd_last.c \
rrd_lastupdate.c \
rrd_first.c \
rrd_restore.c \
- rrd_xport.c \
- rrd_gfx.c \
rrd_dump.c \
rrd_dump.c \
+ rrd_flushcached.c \
rrd_fetch.c \
rrd_resize.c \
rrd_tune.c
rrd_fetch.c \
rrd_resize.c \
rrd_tune.c
+if BUILD_RRDGRAPH
+RRD_C_FILES += rrd_graph.c \
+ rrd_graph_helper.c \
+ rrd_xport.c \
+ rrd_gfx.c \
+ pngsize.c
+endif
+
noinst_HEADERS = \
unused.h \
noinst_HEADERS = \
unused.h \
+ gettext.h \
rrd_getopt.h rrd_parsetime.h \
rrd_config_bottom.h rrd_i18n.h \
rrd_format.h rrd_tool.h rrd_xport.h rrd.h rrd_rpncalc.h \
rrd_getopt.h rrd_parsetime.h \
rrd_config_bottom.h rrd_i18n.h \
rrd_format.h rrd_tool.h rrd_xport.h rrd.h rrd_rpncalc.h \
fnv.h rrd_graph.h \
rrd_is_thread_safe.h
fnv.h rrd_graph.h \
rrd_is_thread_safe.h
+if BUILD_LIBDBI
+RRD_C_FILES += rrd_fetch_libdbi.c
+endif
+
if BUILD_GETOPT
noinst_HEADERS += rrd_getopt.h
UPD_C_FILES += rrd_getopt.c rrd_getopt1.c
if BUILD_GETOPT
noinst_HEADERS += rrd_getopt.h
UPD_C_FILES += rrd_getopt.c rrd_getopt1.c
endif
librrdupd_la_SOURCES = $(UPD_C_FILES) rrd_not_thread_safe.c
endif
librrdupd_la_SOURCES = $(UPD_C_FILES) rrd_not_thread_safe.c
-librrdupd_la_LIBADD = $(CORE_LIBS) @LIB_LIBINTL@
+librrdupd_la_LIBADD = $(CORE_LIBS)
librrd_la_SOURCES = $(RRD_C_FILES)
librrd_la_DEPENDENCIES = librrdupd.la librrd.sym
librrd_la_SOURCES = $(RRD_C_FILES)
librrd_la_DEPENDENCIES = librrdupd.la librrd.sym
-librrd_la_LIBADD = librrdupd.la $(ALL_LIBS)
+librrd_la_LIBADD = librrdupd.la $(ALL_LIBS) $(LIBINTL)
librrd_la_LDFLAGS = -version-info @LIBVERS@
librrd_la_LDFLAGS += -export-symbols librrd.sym
librrd_th_la_SOURCES = $(UPD_C_FILES) $(RRD_C_FILES) rrd_thread_safe.c
librrd_th_la_DEPENDENCIES = librrd.sym
librrd_la_LDFLAGS = -version-info @LIBVERS@
librrd_la_LDFLAGS += -export-symbols librrd.sym
librrd_th_la_SOURCES = $(UPD_C_FILES) $(RRD_C_FILES) rrd_thread_safe.c
librrd_th_la_DEPENDENCIES = librrd.sym
-librrd_th_la_CFLAGS = $(MULTITHREAD_CFLAGS)
+librrd_th_la_CFLAGS = $(AM_CFLAGS) $(MULTITHREAD_CFLAGS)
librrd_th_la_LDFLAGS = $(MULTITHREAD_LDFLAGS) -version-info @LIBVERS@
librrd_th_la_LDFLAGS += -export-symbols librrd.sym
librrd_th_la_LDFLAGS = $(MULTITHREAD_LDFLAGS) -version-info @LIBVERS@
librrd_th_la_LDFLAGS += -export-symbols librrd.sym
-librrd_th_la_LIBADD = $(ALL_LIBS)
+librrd_th_la_LIBADD = $(ALL_LIBS) $(LIBINTL)
-include_HEADERS = rrd.h rrd_format.h
+include_HEADERS = rrd.h rrd_format.h rrd_client.h
-bin_PROGRAMS = rrdtool rrdupdate
+bin_PROGRAMS = rrdtool rrdupdate rrdcached
if BUILD_RRDCGI
bin_PROGRAMS += rrdcgi
if BUILD_RRDCGI
bin_PROGRAMS += rrdcgi
rrdtool_DEPENDENCIES = librrd.la
rrdtool_LDADD = librrd.la
rrdtool_DEPENDENCIES = librrd.la
rrdtool_LDADD = librrd.la
+rrdcached_SOURCES = rrd_daemon.c
+rrdcached_DEPENDENCIES = librrd_th.la
+rrdcached_CPPFLAGS = -DVERSION='"$(VERSION)"' -DLOCALSTATEDIR='"$(localstatedir)"'
+rrdcached_LDADD = librrd_th.la
+
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = librrd.pc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = librrd.pc
EXTRA_DIST= librrd.pc.in strftime.c strftime.h rrd_getopt.c rrd_getopt1.c rrd_getopt.h \
win32comp.c rrd_thread_safe_nt.c get_ver.awk librrd.sym.in.in plbasename.c plbasename.h
EXTRA_DIST= librrd.pc.in strftime.c strftime.h rrd_getopt.c rrd_getopt1.c rrd_getopt.h \
win32comp.c rrd_thread_safe_nt.c get_ver.awk librrd.sym.in.in plbasename.c plbasename.h
+
librrd.sym: librrd.sym.in
librrd.sym: librrd.sym.in
- grep -v LIBC_HAS_GETOPT_LONG librrd.sym.in >$@
+ $(AM_V_GEN)grep -v LIBC_HAS_GETOPT_LONG librrd.sym.in >$@
+
+install-exec-hook:
+ (cd $(DESTDIR)$(bindir) && $(LN_S) rrdupdate rrdcreate && $(LN_S) rrdupdate rrdinfo) || true