X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=11e34a9fe1af9a39799415f11843c06739d3c1bb;hb=c1e47ad7b5e5e889fb86250f714b299e4bf8819f;hp=6b85c0358689e2acf4765896a949bd620477602b;hpb=f4d470590b45f3380170acc9e3a1b5e428524e23;p=collectd.git diff --git a/src/Makefile.am b/src/Makefile.am index 6b85c035..11e34a9f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,6 @@ +SUBDIRS = libconfig if BUILD_MODULE_PING -SUBDIRS = libping . +SUBDIRS += libping endif sbin_PROGRAMS = collectd @@ -9,7 +10,8 @@ collectd_SOURCES = collectd.c collectd.h \ utils_mount.c utils_mount.h \ common.c common.h \ multicast.c multicast.h \ - plugin.c plugin.h + plugin.c plugin.h \ + configfile.c configfile.h #collectd_CFLAGS = -DPLUGINDIR='"$(pkglibdir)"' collectd_CPPFLAGS = $(LTDLINCL) collectd_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' @@ -22,9 +24,9 @@ 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) +collectd_CFLAGS = -Wall -Werror +collectd_LDADD = $(LIBLTDL) libconfig/libconfig.la "-dlopen" self +collectd_DEPENDENCIES = $(LIBLTDL) libconfig/libconfig.la pkglib_LTLIBRARIES = @@ -158,7 +160,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 +users_la_CFLAGS = -Wall -Werror collectd_LDADD += "-dlopen" users.la collectd_DEPENDENCIES += users.la endif