X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=6e84eafe9235f85c6c877b8fe82c6c3ab84c13cc;hb=0f9c7ce19f32c64ae54f0132763d9f38cf57b5b1;hp=e084930a3157cc2bc54295001ba497f489810a96;hpb=4f8eb9713e492396242e17de4c73a31ce94486d6;p=collectd.git

diff --git a/src/Makefile.am b/src/Makefile.am
index e084930a..6e84eafe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,6 +33,7 @@ collectd_SOURCES = collectd.c collectd.h \
 		   utils_ignorelist.c utils_ignorelist.h \
 		   utils_llist.c utils_llist.h \
 		   utils_parse_option.c utils_parse_option.h \
+		   utils_random.c utils_random.h \
 		   utils_tail_match.c utils_tail_match.h \
 		   utils_match.c utils_match.h \
 		   utils_subst.c utils_subst.h \
@@ -90,6 +91,7 @@ collectdmon_SOURCES = collectdmon.c
 collectdmon_CPPFLAGS = $(AM_CPPFLAGS)
 
 collectd_nagios_SOURCES = collectd-nagios.c
+collectd_nagios_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/libcollectdclient/collectd
 collectd_nagios_LDADD =
 if BUILD_WITH_LIBSOCKET
 collectd_nagios_LDADD += -lsocket
@@ -103,6 +105,7 @@ collectd_nagios_DEPENDENCIES = libcollectdclient/libcollectdclient.la
 
 
 collectdctl_SOURCES = collectdctl.c
+collectdctl_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/libcollectdclient/collectd
 collectdctl_LDADD =
 if BUILD_WITH_LIBSOCKET
 collectdctl_LDADD += -lsocket
@@ -115,10 +118,14 @@ collectdctl_DEPENDENCIES = libcollectdclient/libcollectdclient.la
 
 collectd_tg_SOURCES = collectd-tg.c \
 		      utils_heap.c utils_heap.h
+collectd_tg_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/libcollectdclient/collectd
 collectd_tg_LDADD =
 if BUILD_WITH_LIBSOCKET
 collectd_tg_LDADD += -lsocket
 endif
+if BUILD_WITH_LIBRT
+collectd_tg_LDADD += -lrt
+endif
 if BUILD_AIX
 collectd_tg_LDADD += -lm
 endif
@@ -130,6 +137,7 @@ pkglib_LTLIBRARIES =
 
 BUILT_SOURCES = 
 CLEANFILES = 
+DISTCLEANFILES = 
 
 if BUILD_PLUGIN_AGGREGATION
 pkglib_LTLIBRARIES += aggregation.la
@@ -896,9 +904,9 @@ collectd_LDADD += "-dlopen" pf.la
 collectd_DEPENDENCIES += pf.la
 endif
 
-if BUILD_PLUGIN_PINBA
 BUILT_SOURCES += pinba.pb-c.c pinba.pb-c.h
-CLEANFILES += pinba.pb-c.c pinba.pb-c.h
+DISTCLEANFILES += pinba.pb-c.c pinba.pb-c.h
+if BUILD_PLUGIN_PINBA
 pkglib_LTLIBRARIES += pinba.la
 pinba_la_SOURCES = pinba.c
 pinba_la_LDFLAGS = -module -avoid-version
@@ -981,17 +989,6 @@ collectd_LDADD += "-dlopen" redis.la
 collectd_DEPENDENCIES += redis.la
 endif
 
-if BUILD_PLUGIN_RIEMANN
-BUILT_SOURCES += riemann.pb-c.c riemann.pb-c.h
-CLEANFILES += riemann.pb-c.c riemann.pb-c.h
-pkglib_LTLIBRARIES += riemann.la
-riemann_la_SOURCES = riemann.c riemann.pb-c.c
-riemann_la_LDFLAGS = -module -avoid-version
-riemann_la_LIBADD = -lprotobuf-c
-collectd_LDADD += "-dlopen" riemann.la
-collectd_DEPENDENCIES += riemann.la
-endif
-
 if BUILD_PLUGIN_ROUTEROS
 pkglib_LTLIBRARIES += routeros.la
 routeros_la_SOURCES = routeros.c
@@ -1108,6 +1105,14 @@ collectd_LDADD += "-dlopen" tail.la
 collectd_DEPENDENCIES += tail.la
 endif
 
+if BUILD_PLUGIN_TAIL_CSV
+pkglib_LTLIBRARIES += tail_csv.la
+tail_csv_la_SOURCES = tail_csv.c
+tail_csv_la_LDFLAGS = -module -avoid-version
+collectd_LDADD += "-dlopen" tail_csv.la
+collectd_DEPENDENCIES += tail_csv.la
+endif
+
 if BUILD_PLUGIN_TAPE
 pkglib_LTLIBRARIES += tape.la
 tape_la_SOURCES = tape.c
@@ -1347,6 +1352,17 @@ collectd_LDADD += "-dlopen" write_redis.la
 collectd_DEPENDENCIES += write_redis.la
 endif
 
+BUILT_SOURCES += riemann.pb-c.c riemann.pb-c.h
+DISTCLEANFILES += riemann.pb-c.c riemann.pb-c.h
+if BUILD_PLUGIN_WRITE_RIEMANN
+pkglib_LTLIBRARIES += write_riemann.la
+write_riemann_la_SOURCES = write_riemann.c riemann.pb-c.c
+write_riemann_la_LDFLAGS = -module -avoid-version
+write_riemann_la_LIBADD = -lprotobuf-c
+collectd_LDADD += "-dlopen" write_riemann.la
+collectd_DEPENDENCIES += write_riemann.la
+endif
+
 if BUILD_PLUGIN_XMMS
 pkglib_LTLIBRARIES += xmms.la
 xmms_la_SOURCES = xmms.c
@@ -1380,13 +1396,17 @@ dist_man_MANS = collectd.1 \
 		collectd-perl.5 \
 		collectd-python.5 \
 		collectd-snmp.5 \
+		collectd-tg.1 \
 		collectd-threshold.5 \
 		collectd-unixsock.5 \
 		types.db.5
 
 #collectd_1_SOURCES = collectd.pod
 
-EXTRA_DIST = types.db pinba.proto riemann.proto
+EXTRA_DIST = types.db
+
+EXTRA_DIST += pinba.proto pinba.pb-c.c pinba.pb-c.h
+EXTRA_DIST += riemann.proto riemann.pb-c.c riemann.pb-c.h
 
 EXTRA_DIST +=   collectd.conf.pod \
 		collectd-email.pod \
@@ -1399,6 +1419,7 @@ EXTRA_DIST +=   collectd.conf.pod \
 		collectd-python.pod \
 		collectd.pod \
 		collectd-snmp.pod \
+		collectd-tg.pod \
 		collectd-threshold.pod \
 		collectd-unixsock.pod \
 		postgresql_default.conf \
@@ -1421,10 +1442,24 @@ EXTRA_DIST +=   collectd.conf.pod \
 	fi
 
 pinba.pb-c.c pinba.pb-c.h: pinba.proto
-	protoc-c --c_out . pinba.proto
+if HAVE_PROTOC_C
+	protoc-c -I$(srcdir) --c_out . $(srcdir)/pinba.proto
+else
+	@echo "INFO Could not find protoc-c. This tool is necessary to generate $@"
+	@echo "INFO Check http://code.google.com/p/protobuf-c for more information"
+	@echo "INFO Note : package for Debian (Ubuntu...) is protobuf-c-compiler and protobuf-c0-dev will also be needed"
+	@echo "INFO Note : package for Fedora (Redhat, Centos...) is protobuf-c and protobuf-c-devel will also be needed"
+endif
 
 riemann.pb-c.c riemann.pb-c.h: riemann.proto
-	protoc-c --c_out . riemann.proto
+if HAVE_PROTOC_C
+	protoc-c -I$(srcdir) --c_out . $(srcdir)/riemann.proto
+else
+	@echo "INFO Could not find protoc-c. This tool is necessary to generate $@"
+	@echo "INFO Check http://code.google.com/p/protobuf-c for more information"
+	@echo "INFO Note : package for Debian (Ubuntu...) is protobuf-c-compiler and protobuf-c0-dev will also be needed"
+	@echo "INFO Note : package for Fedora (Redhat, Centos...) is protobuf-c and protobuf-c-devel will also be needed"
+endif
 
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)