X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2FMakefile.am;h=d979672d7dc388d85c6214f66849d30462f79398;hp=672b90bd46a8fb3ba39d8561063159a97df4cff9;hb=0482645ed1ffd91e086523af03631f28af9211e2;hpb=42e0a931f1424c2d13794e3a064d328669ed7767 diff --git a/src/Makefile.am b/src/Makefile.am index 672b90b..d979672 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}"' @@ -21,7 +22,8 @@ pkgcoreinclude_HEADERS = \ include/core/object.h \ include/core/plugin.h \ include/core/store.h \ - include/core/time.h + include/core/time.h \ + include/core/timeseries.h pkgfeincludedir = $(pkgincludedir)/frontend pkgfeinclude_HEADERS = \ include/frontend/connection.h \ @@ -30,10 +32,12 @@ pkgfeinclude_HEADERS = \ include/frontend/sock.h pkgutilsincludedir = $(pkgincludedir)/utils pkgutilsinclude_HEADERS = \ + include/utils/avltree.h \ include/utils/channel.h \ include/utils/dbi.h \ include/utils/error.h \ include/utils/llist.h \ + include/utils/os.h \ include/utils/proto.h \ include/utils/strbuf.h \ include/utils/unixsock.h @@ -46,6 +50,8 @@ pkgclientinclude_HEADERS = \ noinst_LTLIBRARIES = libsysdbclient.la libsysdb.la libsysdbclient_la_SOURCES = \ + core/data.c include/core/data.h \ + core/time.c include/core/time.h \ client/client.c include/client/sysdb.h \ client/sock.c include/client/sock.h \ utils/error.c include/utils/error.h \ @@ -53,7 +59,8 @@ libsysdbclient_la_SOURCES = \ utils/strbuf.c include/utils/strbuf.h libsysdbclient_la_CFLAGS = $(AM_CFLAGS) libsysdbclient_la_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) -libsysdbclient_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 -pthread +libsysdbclient_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 \ + -pthread -lm -lrt libsysdbclient_la_LIBADD = $(LIBLTDL) # don't use strict CFLAGS for flex code @@ -68,27 +75,33 @@ libsysdb_la_SOURCES = \ core/plugin.c include/core/plugin.h \ 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 \ + core/time.c include/core/time.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 \ frontend/sock.c include/frontend/sock.h \ frontend/session.c \ frontend/query.c \ + utils/avltree.c include/utils/avltree.h \ utils/channel.c include/utils/channel.h \ utils/error.c include/utils/error.h \ utils/llist.c include/utils/llist.h \ utils/os.c include/utils/os.h \ utils/proto.c include/utils/proto.h \ utils/strbuf.c include/utils/strbuf.h \ - core/time.c include/core/time.h \ utils/unixsock.c include/utils/unixsock.h libsysdb_la_CFLAGS = $(AM_CFLAGS) libsysdb_la_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) -libsysdb_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 -pthread +libsysdb_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 \ + -pthread -lm -lrt libsysdb_la_LIBADD = libsysdb_fe_parser.la \ - $(LIBLTDL) -lrt liboconfig/liboconfig.la + $(LIBLTDL) liboconfig/liboconfig.la libsysdb_la_DEPENDENCIES = libsysdb_fe_parser.la liboconfig/liboconfig.la if BUILD_WITH_LIBDBI @@ -110,10 +123,11 @@ 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@ +sysdb_LDADD = libsysdb_scanner.la libsysdbclient.la @READLINE_LIBS@ -lm endif sysdbd_SOURCES = tools/sysdbd/main.c include/sysdb.h \ @@ -121,7 +135,7 @@ sysdbd_SOURCES = tools/sysdbd/main.c include/sysdb.h \ $(libsysdb_la_SOURCES) sysdbd_CFLAGS = $(AM_CFLAGS) -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\"" sysdbd_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) -sysdbd_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -pthread +sysdbd_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -pthread -lm sysdbd_LDADD = libsysdb_fe_parser.la liboconfig/liboconfig.la \ $(LIBLTDL) -lrt sysdbd_DEPENDENCIES = libsysdb_fe_parser.la liboconfig/liboconfig.la @@ -137,12 +151,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 @@ -152,28 +168,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 @@ -184,6 +208,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" \