diff --git a/src/Makefile.am b/src/Makefile.am
index 09bbe86c08b5e91a1cdcc9f124f69aec242779a9..9998e4afdefe9506398c19233badfc82d8fd90d1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
rrd_client.c \
rrd_nan_inf.c \
rrd_rpncalc.c \
+ rrd_utils.c \
rrd_update.c
RRD_C_FILES = \
rrd_xport.c \
rrd_gfx.c \
rrd_dump.c \
- rrd_flush.c \
+ rrd_flushcached.c \
rrd_fetch.c \
rrd_resize.c \
rrd_tune.c
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 \
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
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
rrdtool_LDADD = librrd.la
rrdcached_SOURCES = rrd_daemon.c
-rrdcached_DEPENDENCIES = librrd.la
+rrdcached_DEPENDENCIES = librrd_th.la
rrdcached_CPPFLAGS = -DVERSION='"$(VERSION)"' -DLOCALSTATEDIR='"$(localstatedir)"'
-rrdcached_LDADD = librrd.la
+rrdcached_LDADD = librrd_th.la
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = librrd.pc
# strftime is here because we do not usually need it. unices have propper
# iso date support
-EXTRA_DIST= 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
+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
+ $(AM_V_GEN)grep -v LIBC_HAS_GETOPT_LONG librrd.sym.in >$@