X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=97b4f44318f316370cba15bf923bb79d455ae1dd;hb=de063c8f7b0498bae85a5b23e10de7750285403e;hp=09bbe86c08b5e91a1cdcc9f124f69aec242779a9;hpb=24a1cb649dd3b5c5d93fa470ebfe4d88abb2af00;p=rrdtool.git diff --git a/src/Makefile.am b/src/Makefile.am index 09bbe86..97b4f44 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,6 +28,7 @@ UPD_C_FILES = \ rrd_client.c \ rrd_nan_inf.c \ rrd_rpncalc.c \ + rrd_utils.c \ rrd_update.c RRD_C_FILES = \ @@ -44,7 +45,7 @@ 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 @@ -58,6 +59,10 @@ noinst_HEADERS = \ 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 @@ -105,12 +110,18 @@ rrdtool_DEPENDENCIES = librrd.la 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 >$@