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

diff --git a/src/Makefile.am b/src/Makefile.am
index 2e3eb45..787ecda 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,9 +4,9 @@ AM_CFLAGS = @STRICT_CFLAGS@ -Iinclude
 AM_CPPFLAGS  = -DSYSCONFDIR='"${sysconfdir}"'
 AM_CPPFLAGS += -DPKGLIBDIR='"${pkglibdir}"'
 
-BUILT_SOURCES = include/syscollector.h
+BUILT_SOURCES = include/sysdb.h
 
-pkginclude_HEADERS = include/syscollector.h
+pkginclude_HEADERS = include/sysdb.h
 pkgcoreincludedir = $(pkgincludedir)/core
 pkgcoreinclude_HEADERS = \
 		include/core/object.h \
@@ -16,10 +16,10 @@ pkgutilsinclude_HEADERS = \
 		include/utils/llist.h \
 		include/utils/string.h
 
-lib_LTLIBRARIES = libsyscollector.la
+lib_LTLIBRARIES = libsysdb.la
 
-libsyscollector_la_SOURCES = \
-		syscollector.c include/syscollector.h \
+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 \
@@ -28,25 +28,25 @@ libsyscollector_la_SOURCES = \
 		utils/string.c include/utils/string.h \
 		utils/time.c include/utils/time.h \
 		utils/unixsock.c include/utils/unixsock.h
-libsyscollector_la_CFLAGS = $(AM_CFLAGS)
-libsyscollector_la_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
-libsyscollector_la_LDFLAGS = -version-info 0:0:0 -pthread
-libsyscollector_la_LIBADD = $(LIBLTDL) -lrt liboconfig/liboconfig.la
-libsyscollector_la_DEPENDENCIES = liboconfig/liboconfig.la
+libsysdb_la_CFLAGS = $(AM_CFLAGS)
+libsysdb_la_CPPFLAGS = $(AM_CPPFLAGS) $(LTDLINCL)
+libsysdb_la_LDFLAGS = -version-info 0:0:0 -pthread
+libsysdb_la_LIBADD = $(LIBLTDL) -lrt liboconfig/liboconfig.la
+libsysdb_la_DEPENDENCIES = liboconfig/liboconfig.la
 
 if BUILD_WITH_LIBDBI
-libsyscollector_la_SOURCES += \
+libsysdb_la_SOURCES += \
 		utils/dbi.c include/utils/dbi.h
-libsyscollector_la_LIBADD += -ldbi
+libsysdb_la_LIBADD += -ldbi
 endif
 
-bin_PROGRAMS = syscollectord
+bin_PROGRAMS = sysdbd
 
-syscollectord_SOURCES = daemon/syscollectord.c include/syscollector.h \
+sysdbd_SOURCES = daemon/sysdbd.c include/sysdb.h \
 		daemon/config.c include/daemon/config.h
-syscollectord_CFLAGS = $(AM_CFLAGS) -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\""
-syscollectord_LDADD = libsyscollector.la liboconfig/liboconfig.la
-syscollectord_DEPENDENCIES = liboconfig/liboconfig.la
+sysdbd_CFLAGS = $(AM_CFLAGS) -DBUILD_DATE="\"$$( date --utc '+%F %T' ) (UTC)\""
+sysdbd_LDADD = libsysdb.la liboconfig/liboconfig.la
+sysdbd_DEPENDENCIES = liboconfig/liboconfig.la
 
 pkgbackendlibdir = $(pkglibdir)/backend
 
@@ -56,42 +56,42 @@ if BUILD_PLUGIN_COLLECTD
 pkgbackendlib_LTLIBRARIES += backend/collectd.la
 backend_collectd_la_SOURCES = backend/collectd.c
 backend_collectd_la_LDFLAGS = -module -avoid-version
-libsyscollector_la_LIBADD += -dlopen backend/collectd.la
-libsyscollector_la_DEPENDENCIES += backend/collectd.la
+libsysdb_la_LIBADD += -dlopen backend/collectd.la
+libsysdb_la_DEPENDENCIES += backend/collectd.la
 endif
 
 if BUILD_PLUGIN_MKLIVESTATUS
 pkgbackendlib_LTLIBRARIES += backend/mk-livestatus.la
 backend_mk_livestatus_la_SOURCES = backend/mk-livestatus.c
 backend_mk_livestatus_la_LDFLAGS = -module -avoid-version
-libsyscollector_la_LIBADD += -dlopen backend/mk-livestatus.la
-libsyscollector_la_DEPENDENCIES += backend/mk-livestatus.la
+libsysdb_la_LIBADD += -dlopen backend/mk-livestatus.la
+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
-libsyscollector_la_LIBADD += -dlopen backend/puppet-storeconfigs.la
-libsyscollector_la_DEPENDENCIES += backend/puppet-storeconfigs.la
+libsysdb_la_LIBADD += -dlopen backend/puppet-storeconfigs.la
+libsysdb_la_DEPENDENCIES += backend/puppet-storeconfigs.la
 endif
 
-include/syscollector.h: include/syscollector.h.in ../version
+include/sysdb.h: include/sysdb.h.in ../version
 	source ../version; sed \
-	    -e "s/@SC_VERSION_MAJOR@/$$VERSION_MAJOR/g" \
-	    -e "s/@SC_VERSION_MINOR@/$$VERSION_MINOR/g" \
-	    -e "s/@SC_VERSION_PATCH@/$$VERSION_PATCH/g" \
-	    -e "s/@SC_VERSION_EXTRA@/$$VERSION_EXTRA/g" \
-	    -e "s/@SC_VERSION_STRING@/$$VERSION_STRING/g" \
-	    include/syscollector.h.in > include/syscollector.h
+	    -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/sysdb.h.in > include/sysdb.h
 
 install-exec-hook:
-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/syscollector
-	if test -e $(DESTDIR)$(sysconfdir)/syscollector/syscollectord.conf; then \
-		$(INSTALL) -m 0640 daemon/syscollectord.conf \
-			$(DESTDIR)$(sysconfdir)/syscollector/syscollectord.conf.pkg-orig; \
+	$(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/syscollectord.conf \
-			$(DESTDIR)$(sysconfdir)/syscollector/syscollectord.conf; \
+		$(INSTALL) -m 0640 daemon/sysdbd.conf \
+			$(DESTDIR)$(sysconfdir)/sysdb/sysdbd.conf; \
 	fi