X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2FMakefile.am;h=e547fa4b543dc873b94b420218303279d3d373ea;hp=a2f0de06ae8e2550b7e6aca5cc05f4f584923824;hb=50f0c90249b043acd6dd72979a319f81f2e48f74;hpb=4f560f6144aa610163e2a3ec326e63e0751c5c3e

diff --git a/src/Makefile.am b/src/Makefile.am
index a2f0de0..e547fa4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,31 +1,71 @@
 SUBDIRS = liboconfig
 
-AM_CFLAGS = @STRICT_CFLAGS@ -Iinclude
-AM_CPPFLAGS  = -DSYSCONFDIR='"${sysconfdir}"'
+AM_CFLAGS = @STRICT_CFLAGS@
+AM_CPPFLAGS  = -Iinclude
+AM_CPPFLAGS += -DSYSCONFDIR='"${sysconfdir}"'
+AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'
 AM_CPPFLAGS += -DPKGLIBDIR='"${pkglibdir}"'
 
-BUILT_SOURCES = include/sysdb.h
+BUILT_SOURCES = include/client/sysdb.h include/sysdb.h
 
 pkginclude_HEADERS = include/sysdb.h
 pkgcoreincludedir = $(pkgincludedir)/core
 pkgcoreinclude_HEADERS = \
+		include/core/data.h \
 		include/core/object.h \
-		include/core/plugin.h
+		include/core/plugin.h \
+		include/core/store.h \
+		include/core/time.h
+pkgfeincludedir = $(pkgincludedir)/frontend
+pkgfeinclude_HEADERS = \
+		include/frontend/connection.h \
+		include/frontend/proto.h \
+		include/frontend/sock.h
 pkgutilsincludedir = $(pkgincludedir)/utils
 pkgutilsinclude_HEADERS = \
-		include/utils/llist.h
-
-lib_LTLIBRARIES = libsysdb.la
+		include/utils/channel.h \
+		include/utils/dbi.h \
+		include/utils/error.h \
+		include/utils/llist.h \
+		include/utils/proto.h \
+		include/utils/strbuf.h \
+		include/utils/unixsock.h
+
+pkgclientincludedir = $(pkgincludedir)/client
+pkgclientinclude_HEADERS = \
+		include/client/sock.h \
+		include/client/sysdb.h
+
+lib_LTLIBRARIES = libsysdbclient.la libsysdb.la
+
+libsysdbclient_la_SOURCES = \
+		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/strbuf.c include/utils/strbuf.h
+libsysdbclient_la_CFLAGS = $(AM_CFLAGS)
+libsysdbclient_la_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
+libsysdbclient_la_LDFLAGS = -version-info 0:0:0 -pthread
+libsysdbclient_la_LIBADD = $(LIBLTDL)
 
 libsysdb_la_SOURCES = \
 		sysdb.c include/sysdb.h \
 		core/object.c include/core/object.h \
 		core/plugin.c include/core/plugin.h \
 		core/store.c include/core/store.h \
-		include/utils/data.h \
+		include/core/data.h \
+		frontend/connection.c include/frontend/connection.h \
+		include/frontend/connection-private.h \
+		frontend/sock.c include/frontend/sock.h \
+		frontend/session.c \
+		frontend/query.c \
+		utils/channel.c include/utils/channel.h \
 		utils/error.c include/utils/error.h \
 		utils/llist.c include/utils/llist.h \
-		utils/time.c include/utils/time.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)
@@ -39,7 +79,11 @@ libsysdb_la_SOURCES += \
 libsysdb_la_LIBADD += -ldbi
 endif
 
-bin_PROGRAMS = sysdbd
+bin_PROGRAMS = sysdb sysdbd
+
+sysdb_SOURCES = client/sysdb.c include/client/sysdb.h
+sysdb_CFLAGS = $(AM_CFLAGS) -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\""
+sysdb_LDADD = libsysdbclient.la
 
 sysdbd_SOURCES = daemon/sysdbd.c include/sysdb.h \
 		daemon/config.c include/daemon/config.h
@@ -52,9 +96,14 @@ dist_sdbconf_DATA = daemon/sysdbd.conf.sample
 
 pkgbackendlibdir = $(pkglibdir)/backend
 pkgbackendcollectdlibdir = $(pkgbackendlibdir)/collectd
+pkgbackendpuppetlibdir = $(pkgbackendlibdir)/puppet
+pkgcnamelibdir = $(pkglibdir)/cname
 
+pkglib_LTLIBRARIES =
 pkgbackendlib_LTLIBRARIES =
 pkgbackendcollectdlib_LTLIBRARIES =
+pkgbackendpuppetlib_LTLIBRARIES =
+pkgcnamelib_LTLIBRARIES =
 
 if BUILD_PLUGIN_COLLECTD
 pkgbackendcollectdlib_LTLIBRARIES += backend/collectd/unixsock.la
@@ -73,13 +122,38 @@ libsysdb_la_DEPENDENCIES += backend/mk-livestatus.la
 endif
 
 if BUILD_PLUGIN_PUPPETSTORECONFIGS
-pkgbackendlib_LTLIBRARIES += backend/puppet-storeconfigs.la
-backend_puppet_storeconfigs_la_SOURCES = backend/puppet-storeconfigs.c
-backend_puppet_storeconfigs_la_LDFLAGS = -module -avoid-version
-libsysdb_la_LIBADD += -dlopen backend/puppet-storeconfigs.la
-libsysdb_la_DEPENDENCIES += backend/puppet-storeconfigs.la
+pkgbackendpuppetlib_LTLIBRARIES += backend/puppet/store-configs.la
+backend_puppet_store_configs_la_SOURCES = backend/puppet/store-configs.c
+backend_puppet_store_configs_la_LDFLAGS = -module -avoid-version
+libsysdb_la_LIBADD += -dlopen backend/puppet/store-configs.la
+libsysdb_la_DEPENDENCIES += backend/puppet/store-configs.la
+endif
+
+if BUILD_PLUGIN_SYSLOG
+pkglib_LTLIBRARIES += plugins/syslog.la
+plugins_syslog_la_SOURCE = plugins/syslog.c
+plugins_syslog_la_LDFLAGS = -module -avoid-version
+libsysdb_la_LIBADD += -dlopen plugins/syslog.la
+libsysdb_la_DEPENDENCIES += plugins/syslog.la
+endif
+
+if BUILD_PLUGIN_CNAMEDNS
+pkgcnamelib_LTLIBRARIES += plugins/cname/dns.la
+plugins_cname_dns_la_SOURCE = plugins/cname/dns.c
+plugins_cname_dns_la_LDFLAGS = -module -avoid-version
+libsysdb_la_LIBADD += -dlopen plugins/cname/dns.la
+libsysdb_la_DEPENDENCIES += plugins/cname/dns.la
 endif
 
+include/client/sysdb.h: include/client/sysdb.h.in ../version
+	source ../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
+
 include/sysdb.h: include/sysdb.h.in ../version
 	source ../version; sed \
 	    -e "s/@SDB_VERSION_MAJOR@/$$VERSION_MAJOR/g" \