Took a closer `look' at last nights changes..

[collectd.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 8ec68e9..6b85c03 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,6 @@
-SUBDIRS = libconfig
 if BUILD_MODULE_PING
-SUBDIRS += libping
+SUBDIRS = libping .
 endif
-#SUBDIRS += .
 
 sbin_PROGRAMS = collectd
 
@@ -11,17 +9,22 @@ collectd_SOURCES = collectd.c collectd.h \
                   utils_mount.c utils_mount.h \
                   common.c common.h \
                   multicast.c multicast.h \
-                  plugin.c plugin.h \
-                  configfile.c configfile.h
+                  plugin.c plugin.h
 #collectd_CFLAGS = -DPLUGINDIR='"$(pkglibdir)"'
-collectd_CPPFLAGS = -DLOCALSTATEDIR='"$(localstatedir)"' -DPLUGINDIR='"$(pkglibdir)"'
-collectd_LDFLAGS = -export-dynamic -lconfig
-collectd_CFLAGS = -Werror
-collectd_LDADD = $(LIBLTDL) libconfig/libconfig.la "-dlopen" self
-collectd_DEPENDENCIES = $(LIBLTDL) libconfig/libconfig.la
-if BUILD_WITH_RRDTOOL
-collectd_LDADD += -lrrd
+collectd_CPPFLAGS = $(LTDLINCL)
+collectd_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
+collectd_CPPFLAGS += -DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"'
+if BUILD_FEATURE_DAEMON
+collectd_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
+endif
+collectd_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"'
+if BUILD_FEATURE_DEBUG
+collectd_CPPFLAGS += -DLOGFILE='"${localstatedir}/log/${PACKAGE_NAME}/collectd.log"'
 endif
+collectd_LDFLAGS = -export-dynamic
+collectd_CFLAGS = -Werror
+collectd_LDADD = $(LIBLTDL) "-dlopen" self
+collectd_DEPENDENCIES = $(LIBLTDL)
 
 pkglib_LTLIBRARIES = 
 
@@ -155,6 +158,7 @@ if BUILD_MODULE_USERS
 pkglib_LTLIBRARIES += users.la
 users_la_SOURCES = users.c users.h
 users_la_LDFLAGS = -module -avoid-version
+users_la_CFLAGS = -Werror
 collectd_LDADD += "-dlopen" users.la
 collectd_DEPENDENCIES += users.la
 endif