X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2FMakefile.am;h=ddd856cd6b8e858b936132d27a617a67025b58e6;hp=c8ad524c12f6809cd01f7b37b7bac6f1df7128ab;hb=e5d9a9165aaedbfb3b5f6e0bbbb4993d6343fe55;hpb=69ba5856d2f9e396ce1956c24ed0194075800463 diff --git a/src/Makefile.am b/src/Makefile.am index c8ad524..ddd856c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,8 +2,9 @@ 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 = -I${top_builddir}/src/include -I${top_srcdir}/src/include AM_CPPFLAGS += -DSYSCONFDIR='"${sysconfdir}"' AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' AM_CPPFLAGS += -DPKGLIBDIR='"${pkglibdir}"' @@ -38,6 +39,7 @@ pkgutilsinclude_HEADERS = \ include/utils/llist.h \ include/utils/os.h \ include/utils/proto.h \ + include/utils/ssl.h \ include/utils/strbuf.h \ include/utils/unixsock.h @@ -49,15 +51,19 @@ 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 \ utils/proto.c include/utils/proto.h \ + utils/ssl.c include/utils/ssl.h \ utils/strbuf.c include/utils/strbuf.h -libsysdbclient_la_CFLAGS = $(AM_CFLAGS) +libsysdbclient_la_CFLAGS = $(AM_CFLAGS) @OPENSSL_CFLAGS@ libsysdbclient_la_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) -libsysdbclient_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 -pthread -libsysdbclient_la_LIBADD = $(LIBLTDL) +libsysdbclient_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 \ + -pthread -lm -lrt +libsysdbclient_la_LIBADD = $(LIBLTDL) @OPENSSL_LIBS@ # don't use strict CFLAGS for flex code noinst_LTLIBRARIES += libsysdb_fe_parser.la @@ -72,8 +78,10 @@ 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 \ + core/time.c include/core/time.h \ core/timeseries.c include/core/timeseries.h \ frontend/analyzer.c \ frontend/connection.c include/frontend/connection.h \ @@ -81,6 +89,7 @@ libsysdb_la_SOURCES = \ frontend/parser.c include/frontend/parser.h \ frontend/sock.c include/frontend/sock.h \ frontend/session.c \ + frontend/store.c \ frontend/query.c \ utils/avltree.c include/utils/avltree.h \ utils/channel.c include/utils/channel.h \ @@ -88,14 +97,15 @@ libsysdb_la_SOURCES = \ utils/llist.c include/utils/llist.h \ utils/os.c include/utils/os.h \ utils/proto.c include/utils/proto.h \ + utils/ssl.c include/utils/ssl.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_CFLAGS = $(AM_CFLAGS) @OPENSSL_CFLAGS@ libsysdb_la_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) -libsysdb_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0 -pthread -lm +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 @OPENSSL_LIBS@ libsysdb_la_DEPENDENCIES = libsysdb_fe_parser.la liboconfig/liboconfig.la if BUILD_WITH_LIBDBI @@ -117,20 +127,22 @@ 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 \ tools/sysdbd/configfile.c tools/sysdbd/configfile.h \ $(libsysdb_la_SOURCES) -sysdbd_CFLAGS = $(AM_CFLAGS) -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\"" +sysdbd_CFLAGS = $(AM_CFLAGS) @OPENSSL_CFLAGS@ \ + -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\"" sysdbd_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL) sysdbd_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -pthread -lm sysdbd_LDADD = libsysdb_fe_parser.la liboconfig/liboconfig.la \ - $(LIBLTDL) -lrt + $(LIBLTDL) -lrt @OPENSSL_LIBS@ sysdbd_DEPENDENCIES = libsysdb_fe_parser.la liboconfig/liboconfig.la if BUILD_WITH_LIBDBI @@ -145,6 +157,7 @@ pkgbackendcollectdlibdir = $(pkgbackendlibdir)/collectd pkgbackendpuppetlibdir = $(pkgbackendlibdir)/puppet pkgcnamelibdir = $(pkglibdir)/cname pkgtimeserieslibdir = $(pkglibdir)/timeseries +pkgstorelibdir = $(pkglibdir)/store pkglib_LTLIBRARIES = pkgbackendlib_LTLIBRARIES = @@ -152,6 +165,7 @@ pkgbackendcollectdlib_LTLIBRARIES = pkgbackendpuppetlib_LTLIBRARIES = pkgcnamelib_LTLIBRARIES = pkgtimeserieslib_LTLIBRARIES = +pkgstorelib_LTLIBRARIES = if BUILD_PLUGIN_CNAMEDNS pkgcnamelib_LTLIBRARIES += plugins/cname/dns.la @@ -169,6 +183,14 @@ 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 += plugins/backend/mk-livestatus.la plugins_backend_mk_livestatus_la_SOURCES = plugins/backend/mk-livestatus.c @@ -202,23 +224,35 @@ 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 \ +if BUILD_PLUGIN_STORENETWORK +pkgstorelib_LTLIBRARIES += plugins/store/network.la +plugins_store_network_la_SOURCES = plugins/store/network.c +plugins_store_network_la_LDFLAGS = $(AM_LDFLAGS) libsysdbclient.la -module -avoid-version +sysdbd_LDADD += -dlopen plugins/store/network.la +sysdbd_DEPENDENCIES += plugins/store/network.la +endif + +include/client/sysdb.h: include/client/sysdb.h.in $(abs_top_builddir)/version + mkdir -p include/client + source $(abs_top_builddir)/version; sed \ -e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \ -e "s/@SDB_VERSION_MINOR@/$$VERSION_MINOR/g" \ -e "s/@SDB_VERSION_PATCH@/$$VERSION_PATCH/g" \ -e "s/@SDB_VERSION_EXTRA@/$$VERSION_EXTRA/g" \ -e "s/@SDB_VERSION_STRING@/$$VERSION_STRING/g" \ - include/client/sysdb.h.in > include/client/sysdb.h + $(srcdir)/include/client/sysdb.h.in \ + > include/client/sysdb.h -include/sysdb.h: include/sysdb.h.in ../version - source ../version; sed \ +include/sysdb.h: include/sysdb.h.in $(abs_top_builddir)/version + mkdir -p include + source $(abs_top_builddir)/version; sed \ -e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \ -e "s/@SDB_VERSION_MINOR@/$$VERSION_MINOR/g" \ -e "s/@SDB_VERSION_PATCH@/$$VERSION_PATCH/g" \ -e "s/@SDB_VERSION_EXTRA@/$$VERSION_EXTRA/g" \ -e "s/@SDB_VERSION_STRING@/$$VERSION_STRING/g" \ - include/sysdb.h.in > include/sysdb.h + $(srcdir)/include/sysdb.h.in \ + > include/sysdb.h -../version: +$(abs_top_builddir)/version: cd .. && make version