X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FMakefile.am;h=7cff3e8a5b5dafc05568cc41c6ab8f435de6a46d;hb=fd919402b261f5e07e2348a7f22262893f41daf1;hp=a69769d72dd21f159fea34daee3b6d540cae1bb3;hpb=51702755cef0e7ed0b1eef223c153f45302e0d2f;p=sysdb.git

diff --git a/src/Makefile.am b/src/Makefile.am
index a69769d..7cff3e8 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}"'
@@ -49,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 \
@@ -56,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
@@ -72,14 +76,18 @@ 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 \
 		frontend/connection-private.h \
 		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,13 +96,13 @@ libsysdb_la_SOURCES = \
 		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 -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
 libsysdb_la_DEPENDENCIES = libsysdb_fe_parser.la liboconfig/liboconfig.la
 
 if BUILD_WITH_LIBDBI
@@ -116,10 +124,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 \
@@ -144,6 +153,7 @@ pkgbackendcollectdlibdir = $(pkgbackendlibdir)/collectd
 pkgbackendpuppetlibdir = $(pkgbackendlibdir)/puppet
 pkgcnamelibdir = $(pkglibdir)/cname
 pkgtimeserieslibdir = $(pkglibdir)/timeseries
+pkgstorelibdir = $(pkglibdir)/store
 
 pkglib_LTLIBRARIES =
 pkgbackendlib_LTLIBRARIES =
@@ -151,6 +161,7 @@ pkgbackendcollectdlib_LTLIBRARIES =
 pkgbackendpuppetlib_LTLIBRARIES =
 pkgcnamelib_LTLIBRARIES =
 pkgtimeserieslib_LTLIBRARIES =
+pkgstorelib_LTLIBRARIES =
 
 if BUILD_PLUGIN_CNAMEDNS
 pkgcnamelib_LTLIBRARIES += plugins/cname/dns.la
@@ -168,6 +179,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
@@ -201,6 +220,14 @@ sysdbd_LDADD += -dlopen plugins/timeseries/rrdtool.la
 sysdbd_DEPENDENCIES += plugins/timeseries/rrdtool.la
 endif
 
+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 ../version
 	source ../version; sed \
 	    -e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \