Renamed puppet-storeconfigs backend to puppet::store-configs.

[sysdb.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 787ecdaa2c63cc3b4efccc31350348767abf0046..b754beb962b4a50a333c01dafc4f1483afc0c129 100644 (file)
--- 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,8 @@ 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/time.c include/utils/time.h \
                utils/unixsock.c include/utils/unixsock.h
 libsysdb_la_CFLAGS = $(AM_CFLAGS)
@@ -48,16 +47,23 @@ 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
 
 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
@@ -69,11 +75,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
@@ -85,13 +91,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
-