X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=a0b4c2df700538fa9d90e770649e65791ddf2629;hb=0b3f5bda614cbb0795fdb92d6473251004afc86d;hp=06f45dcafe43d9c59410490cd9170858fcd9868d;hpb=149eea1300930abaef37ff9ccb988d952f66125b;p=collectd.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 06f45dca..a0b4c2df 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@ AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
 endif
 AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"'
 
-sbin_PROGRAMS = collectd
+sbin_PROGRAMS = collectd collectdmon
 bin_PROGRAMS = collectd-nagios
 
 collectd_SOURCES = collectd.c collectd.h \
@@ -30,7 +30,9 @@ collectd_SOURCES = collectd.c collectd.h \
 		   utils_cache.c utils_cache.h \
 		   utils_ignorelist.c utils_ignorelist.h \
 		   utils_llist.c utils_llist.h \
+		   utils_logtail.c utils_logtail.h \
 		   utils_mount.c utils_mount.h \
+		   utils_tail.c utils_tail.h \
 		   utils_threshold.c utils_threshold.h \
 		   types_list.c types_list.h
 collectd_CPPFLAGS = $(LTDLINCL)
@@ -77,6 +79,9 @@ else
 collectd_LDFLAGS += -loconfig
 endif
 
+collectdmon_SOURCES = collectdmon.c
+collectdmon_CPPFLAGS = $(AM_CPPFLAGS)
+
 collectd_nagios_SOURCES = collectd-nagios.c
 collectd_nagios_LDFLAGS =
 if BUILD_WITH_LIBSOCKET
@@ -419,9 +424,12 @@ endif
 if BUILD_PLUGIN_NGINX
 pkglib_LTLIBRARIES += nginx.la
 nginx_la_SOURCES = nginx.c
+nginx_la_CFLAGS = $(AM_CFLAGS)
+nginx_la_LIBADD =
 nginx_la_LDFLAGS = -module -avoid-version
 if BUILD_WITH_LIBCURL
-nginx_la_LDFLAGS += $(BUILD_WITH_LIBCURL_LIBS)
+nginx_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
+nginx_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
 endif
 collectd_LDADD += "-dlopen" nginx.la
 collectd_DEPENDENCIES += nginx.la
@@ -575,7 +583,7 @@ endif
 
 if BUILD_PLUGIN_UNIXSOCK
 pkglib_LTLIBRARIES += unixsock.la
-unixsock_la_SOURCES = unixsock.c utils_cmd_putval.h utils_cmd_putval.c
+unixsock_la_SOURCES = unixsock.c utils_cmd_putval.h utils_cmd_putval.c utils_cmd_putnotif.h utils_cmd_putnotif.c
 unixsock_la_LDFLAGS = -module -avoid-version -lpthread
 collectd_LDADD += "-dlopen" unixsock.la
 collectd_DEPENDENCIES += unixsock.la
@@ -627,7 +635,8 @@ endif
 
 dist_man_MANS = collectd.1 collectd-nagios.1 collectd.conf.5 \
 		collectd-email.5 collectd-exec.5 collectd-perl.5 \
-		collectd-snmp.5 collectd-unixsock.5
+		collectd-snmp.5 collectd-unixsock.5 collectdmon.1 \
+		types.db.5
 
 #collectd_1_SOURCES = collectd.pod
 
@@ -635,7 +644,7 @@ EXTRA_DIST = types.db
 
 EXTRA_DIST += collectd-email.pod collectd-exec.pod collectd-nagios.pod \
 	collectd-perl.pod collectd-snmp.pod collectd-unixsock.pod \
-	collectd.conf.pod collectd.pod
+	collectd.conf.pod collectd.pod collectdmon.pod types.db.pod
 
 .pod.1:
 	pod2man --release=$(VERSION) --center=$(PACKAGE) $< >.pod2man.tmp 2>/dev/null && mv -f .pod2man.tmp $@ || true