Merged changes from revision 314 (branches/collectd-configfile) to trunk

[collectd.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 1d246a9..c15e91e 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,8 +9,7 @@ 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 =
 collectd_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
@@ -21,8 +18,8 @@ collectd_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
 collectd_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"'
 collectd_LDFLAGS = -export-dynamic
 collectd_CFLAGS = -Werror
-collectd_LDADD = $(LIBLTDL) libconfig/libconfig.la "-dlopen" self
-collectd_DEPENDENCIES = $(LIBLTDL) libconfig/libconfig.la
+collectd_LDADD = $(LIBLTDL) "-dlopen" self
+collectd_DEPENDENCIES = $(LIBLTDL)
 if BUILD_WITH_RRDTOOL
 collectd_LDADD += -lrrd
 endif