X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2FMakefile.am;h=24b41ae51bedb40ba510eccb7f0f75d1731ce792;hp=787ecdaa2c63cc3b4efccc31350348767abf0046;hb=25ee4640ebe9532d137024cb45760869eef1eee9;hpb=bef7167f0dc1fd405e35d5cbffb3c0820945a9ea

diff --git a/src/Makefile.am b/src/Makefile.am
index 787ecda..24b41ae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,9 @@
 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
@@ -13,8 +15,7 @@ pkgcoreinclude_HEADERS = \
 		include/core/plugin.h
 pkgutilsincludedir = $(pkgincludedir)/utils
 pkgutilsinclude_HEADERS = \
-		include/utils/llist.h \
-		include/utils/string.h
+		include/utils/llist.h
 
 lib_LTLIBRARIES = libsysdb.la
 
@@ -23,10 +24,14 @@ libsysdb_la_SOURCES = \
 		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 \
+		core/error.c include/core/error.h \
+		frontend/connection.c include/frontend/connection.h \
+		frontend/sock.c include/frontend/sock.h \
+		utils/channel.c include/utils/channel.h \
 		utils/llist.c include/utils/llist.h \
-		utils/string.c include/utils/string.h \
-		utils/time.c include/utils/time.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)
@@ -48,16 +53,26 @@ sysdbd_CFLAGS = $(AM_CFLAGS) -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\""
 sysdbd_LDADD = libsysdb.la liboconfig/liboconfig.la
 sysdbd_DEPENDENCIES = liboconfig/liboconfig.la
 
+sdbconfdir = $(sysconfdir)/sysdb
+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
-pkgbackendlib_LTLIBRARIES += backend/collectd.la
-backend_collectd_la_SOURCES = backend/collectd.c
-backend_collectd_la_LDFLAGS = -module -avoid-version
-libsysdb_la_LIBADD += -dlopen backend/collectd.la
-libsysdb_la_DEPENDENCIES += backend/collectd.la
+pkgbackendcollectdlib_LTLIBRARIES += backend/collectd/unixsock.la
+backend_collectd_unixsock_la_SOURCES = backend/collectd/unixsock.c
+backend_collectd_unixsock_la_LDFLAGS = -module -avoid-version
+libsysdb_la_LIBADD += -dlopen backend/collectd/unixsock.la
+libsysdb_la_DEPENDENCIES += backend/collectd/unixsock.la
 endif
 
 if BUILD_PLUGIN_MKLIVESTATUS
@@ -69,11 +84,27 @@ 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/sysdb.h: include/sysdb.h.in ../version
@@ -85,13 +116,3 @@ include/sysdb.h: include/sysdb.h.in ../version
 	    -e "s/@SDB_VERSION_STRING@/$$VERSION_STRING/g" \
 	    include/sysdb.h.in > include/sysdb.h
 
-install-exec-hook:
-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/sysdb
-	if test -e $(DESTDIR)$(sysconfdir)/sysdb/sysdbd.conf; then \
-		$(INSTALL) -m 0640 daemon/sysdbd.conf \
-			$(DESTDIR)$(sysconfdir)/sysdb/sysdbd.conf.pkg-orig; \
-	else \
-		$(INSTALL) -m 0640 daemon/sysdbd.conf \
-			$(DESTDIR)$(sysconfdir)/sysdb/sysdbd.conf; \
-	fi
-