X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=3ab6bc616da82c88e4b38ebea79a5093c44b6712;hb=eb5b91506275c2042f83b44f3eef0274b6915c42;hp=9de8dd02b966108990b20f76f25785039870236c;hpb=19d7d13262095deccad56275584aef7c2e6c5dee;p=sysdb.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 9de8dd0..3ab6bc6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,8 +13,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,11 +22,11 @@ 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 \
-		utils/error.c include/utils/error.h \
+		include/core/data.h \
+		core/error.c include/core/error.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)
@@ -53,15 +52,22 @@ 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
@@ -73,11 +79,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