X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=9876de64a7dc1ab52a84460f6c7ca3eac146b8f0;hb=bcf49768cccf7b536d6c4c741afce40b817b3309;hp=b75bfff7707df6baf99c1d0e22e6cfd5f06a496b;hpb=b7a4c85eca8befee05122d56d31127ad5eb397f2;p=sysdb.git

diff --git a/src/Makefile.am b/src/Makefile.am
index b75bfff..9876de6 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
 
@@ -24,8 +23,9 @@ libsysdb_la_SOURCES = \
 		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 \
 		utils/llist.c include/utils/llist.h \
-		utils/string.c include/utils/string.h \
+		utils/strbuf.c include/utils/strbuf.h \
 		utils/time.c include/utils/time.h \
 		utils/unixsock.c include/utils/unixsock.h
 libsysdb_la_CFLAGS = $(AM_CFLAGS)
@@ -52,15 +52,19 @@ sdbconfdir = $(sysconfdir)/sysdb
 dist_sdbconf_DATA = daemon/sysdbd.conf.sample
 
 pkgbackendlibdir = $(pkglibdir)/backend
+pkgbackendcollectdlibdir = $(pkgbackendlibdir)/collectd
+pkgbackendpuppetlibdir = $(pkgbackendlibdir)/puppet
 
 pkgbackendlib_LTLIBRARIES =
+pkgbackendcollectdlib_LTLIBRARIES =
+pkgbackendpuppetlib_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
@@ -72,11 +76,11 @@ 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
 
 include/sysdb.h: include/sysdb.h.in ../version