X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=ca558623722049c61fb8808d035aaf1867bdaa37;hb=a9ae0d1a4c9e2992d932489c96cd63b2ce2a0c56;hp=c7c53e3289189d9fbb7a67ba4cd7151b18ba1758;hpb=c67634d0683a42c1e5457279de98958cbacc679d;p=sysdb.git

diff --git a/src/Makefile.am b/src/Makefile.am
index c7c53e3..ca55862 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS = liboconfig
 
 # coverage related flags are only set when gcov is enabled
 AM_CFLAGS = @STRICT_CFLAGS@ @COVERAGE_CFLAGS@ @PROFILING_CFLAGS@
+AM_CXXFLAGS = @STRICT_CXXFLAGS@ @COVERAGE_CFLAGS@ @PROFILING_CFLAGS@
 AM_LDFLAGS = @COVERAGE_LDFLAGS@ @PROFILING_LDFLAGS@
 AM_CPPFLAGS  = -I"${top_srcdir}/src/include"
 AM_CPPFLAGS += -DSYSCONFDIR='"${sysconfdir}"'
@@ -72,9 +73,11 @@ libsysdb_la_SOURCES = \
 		core/store.c include/core/store.h \
 		core/store-private.h \
 		core/store_expr.c \
+		core/store_json.c \
 		core/store_lookup.c \
 		core/data.c include/core/data.h \
-		include/core/timeseries.h \
+		core/timeseries.c include/core/timeseries.h \
+		frontend/analyzer.c \
 		frontend/connection.c include/frontend/connection.h \
 		frontend/connection-private.h \
 		frontend/parser.c include/frontend/parser.h \
@@ -116,7 +119,8 @@ sysdb_SOURCES = tools/sysdb/main.c include/client/sysdb.h \
 		tools/sysdb/command.c tools/sysdb/command.h \
 		tools/sysdb/input.c tools/sysdb/input.h \
 		core/object.c include/core/object.h \
-		utils/llist.c include/utils/llist.h
+		utils/llist.c include/utils/llist.h \
+		utils/os.c include/utils/os.h
 sysdb_CFLAGS = -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\"" \
 		$(AM_CFLAGS) @READLINE_CFLAGS@
 sysdb_LDADD = libsysdb_scanner.la libsysdbclient.la @READLINE_LIBS@
@@ -143,12 +147,14 @@ pkgbackendlibdir = $(pkglibdir)/backend
 pkgbackendcollectdlibdir = $(pkgbackendlibdir)/collectd
 pkgbackendpuppetlibdir = $(pkgbackendlibdir)/puppet
 pkgcnamelibdir = $(pkglibdir)/cname
+pkgtimeserieslibdir = $(pkglibdir)/timeseries
 
 pkglib_LTLIBRARIES =
 pkgbackendlib_LTLIBRARIES =
 pkgbackendcollectdlib_LTLIBRARIES =
 pkgbackendpuppetlib_LTLIBRARIES =
 pkgcnamelib_LTLIBRARIES =
+pkgtimeserieslib_LTLIBRARIES =
 
 if BUILD_PLUGIN_CNAMEDNS
 pkgcnamelib_LTLIBRARIES += plugins/cname/dns.la
@@ -158,28 +164,36 @@ sysdbd_LDADD += -dlopen plugins/cname/dns.la
 sysdbd_DEPENDENCIES += plugins/cname/dns.la
 endif
 
-if BUILD_PLUGIN_COLLECTD
-pkgbackendcollectdlib_LTLIBRARIES += backend/collectd/unixsock.la
-backend_collectd_unixsock_la_SOURCES = backend/collectd/unixsock.c
-backend_collectd_unixsock_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
-sysdbd_LDADD += -dlopen backend/collectd/unixsock.la
-sysdbd_DEPENDENCIES += backend/collectd/unixsock.la
+if BUILD_PLUGIN_COLLECTDUNIXSOCK
+pkgbackendcollectdlib_LTLIBRARIES += plugins/backend/collectd/unixsock.la
+plugins_backend_collectd_unixsock_la_SOURCES = plugins/backend/collectd/unixsock.c
+plugins_backend_collectd_unixsock_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
+sysdbd_LDADD += -dlopen plugins/backend/collectd/unixsock.la
+sysdbd_DEPENDENCIES += plugins/backend/collectd/unixsock.la
+endif
+
+if BUILD_PLUGIN_FACTER
+pkgbackendlib_LTLIBRARIES += plugins/backend/facter.la
+plugins_backend_facter_la_SOURCES = plugins/backend/facter.cc
+plugins_backend_facter_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -lfacter
+sysdbd_LDADD += -dlopen plugins/backend/facter.la
+sysdbd_DEPENDENCIES += plugins/backend/facter.la
 endif
 
 if BUILD_PLUGIN_MKLIVESTATUS
-pkgbackendlib_LTLIBRARIES += backend/mk-livestatus.la
-backend_mk_livestatus_la_SOURCES = backend/mk-livestatus.c
-backend_mk_livestatus_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
-sysdbd_LDADD += -dlopen backend/mk-livestatus.la
-sysdbd_DEPENDENCIES += backend/mk-livestatus.la
+pkgbackendlib_LTLIBRARIES += plugins/backend/mk-livestatus.la
+plugins_backend_mk_livestatus_la_SOURCES = plugins/backend/mk-livestatus.c
+plugins_backend_mk_livestatus_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
+sysdbd_LDADD += -dlopen plugins/backend/mk-livestatus.la
+sysdbd_DEPENDENCIES += plugins/backend/mk-livestatus.la
 endif
 
 if BUILD_PLUGIN_PUPPETSTORECONFIGS
-pkgbackendpuppetlib_LTLIBRARIES += backend/puppet/store-configs.la
-backend_puppet_store_configs_la_SOURCES = backend/puppet/store-configs.c
-backend_puppet_store_configs_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
-sysdbd_LDADD += -dlopen backend/puppet/store-configs.la
-sysdbd_DEPENDENCIES += backend/puppet/store-configs.la
+pkgbackendpuppetlib_LTLIBRARIES += plugins/backend/puppet/store-configs.la
+plugins_backend_puppet_store_configs_la_SOURCES = plugins/backend/puppet/store-configs.c
+plugins_backend_puppet_store_configs_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
+sysdbd_LDADD += -dlopen plugins/backend/puppet/store-configs.la
+sysdbd_DEPENDENCIES += plugins/backend/puppet/store-configs.la
 endif
 
 if BUILD_PLUGIN_SYSLOG
@@ -190,6 +204,15 @@ sysdbd_LDADD += -dlopen plugins/syslog.la
 sysdbd_DEPENDENCIES += plugins/syslog.la
 endif
 
+if BUILD_PLUGIN_TIMESERIESRRDTOOL
+pkgtimeserieslib_LTLIBRARIES += plugins/timeseries/rrdtool.la
+plugins_timeseries_rrdtool_la_SOURCES = plugins/timeseries/rrdtool.c
+plugins_timeseries_rrdtool_la_CFLAGS = $(AM_CFLAGS) @RRD_CFLAGS@
+plugins_timeseries_rrdtool_la_LDFLAGS = $(AM_LDFLAGS) @RRD_LIBS@ -module -avoid-version
+sysdbd_LDADD += -dlopen plugins/timeseries/rrdtool.la
+sysdbd_DEPENDENCIES += plugins/timeseries/rrdtool.la
+endif
+
 include/client/sysdb.h: include/client/sysdb.h.in ../version
 	source ../version; sed \
 	    -e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \