projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10' into collectd-5.3
[collectd.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
9c8636c
..
c24e738
100644
(file)
--- 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_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 \
utils_tail_match.c utils_tail_match.h \
utils_match.c utils_match.h \
utils_subst.c utils_subst.h \
@@
-135,14
+136,14
@@
collectd_tg_DEPENDENCIES = libcollectdclient/libcollectdclient.la
pkglib_LTLIBRARIES =
BUILT_SOURCES =
pkglib_LTLIBRARIES =
BUILT_SOURCES =
-CLEANFILES =
+CLEANFILES =
if BUILD_PLUGIN_AGGREGATION
pkglib_LTLIBRARIES += aggregation.la
aggregation_la_SOURCES = aggregation.c \
utils_vl_lookup.c utils_vl_lookup.h
aggregation_la_LDFLAGS = -module -avoid-version
if BUILD_PLUGIN_AGGREGATION
pkglib_LTLIBRARIES += aggregation.la
aggregation_la_SOURCES = aggregation.c \
utils_vl_lookup.c utils_vl_lookup.h
aggregation_la_LDFLAGS = -module -avoid-version
-aggregation_la_LIBADD =
+aggregation_la_LIBADD =
-lm
collectd_LDADD += "-dlopen" aggregation.la
collectd_DEPENDENCIES += aggregation.la
endif
collectd_LDADD += "-dlopen" aggregation.la
collectd_DEPENDENCIES += aggregation.la
endif
@@
-190,7
+191,7
@@
if BUILD_PLUGIN_APPLE_SENSORS
pkglib_LTLIBRARIES += apple_sensors.la
apple_sensors_la_SOURCES = apple_sensors.c
apple_sensors_la_LDFLAGS = -module -avoid-version
pkglib_LTLIBRARIES += apple_sensors.la
apple_sensors_la_SOURCES = apple_sensors.c
apple_sensors_la_LDFLAGS = -module -avoid-version
-apple_sensors_la_L
IBADD = -l
IOKit
+apple_sensors_la_L
DFLAGS += -framework
IOKit
collectd_LDADD += "-dlopen" apple_sensors.la
collectd_DEPENDENCIES += apple_sensors.la
endif
collectd_LDADD += "-dlopen" apple_sensors.la
collectd_DEPENDENCIES += apple_sensors.la
endif
@@
-212,7
+213,7
@@
battery_la_SOURCES = battery.c
battery_la_LDFLAGS = -module -avoid-version
battery_la_LIBADD =
if BUILD_WITH_LIBIOKIT
battery_la_LDFLAGS = -module -avoid-version
battery_la_LIBADD =
if BUILD_WITH_LIBIOKIT
-battery_la_L
IBADD += -l
IOKit
+battery_la_L
DFLAGS += -framework
IOKit
endif
collectd_LDADD += "-dlopen" battery.la
collectd_DEPENDENCIES += battery.la
endif
collectd_LDADD += "-dlopen" battery.la
collectd_DEPENDENCIES += battery.la
@@
-360,7
+361,7
@@
if BUILD_WITH_LIBDEVINFO
disk_la_LIBADD += -ldevinfo
endif
if BUILD_WITH_LIBIOKIT
disk_la_LIBADD += -ldevinfo
endif
if BUILD_WITH_LIBIOKIT
-disk_la_L
IBADD += -l
IOKit
+disk_la_L
DFLAGS += -framework
IOKit
endif
if BUILD_WITH_LIBSTATGRAB
disk_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
endif
if BUILD_WITH_LIBSTATGRAB
disk_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
@@
-476,8
+477,8
@@
if BUILD_PLUGIN_IPTABLES
pkglib_LTLIBRARIES += iptables.la
iptables_la_SOURCES = iptables.c
iptables_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBIPTC_CPPFLAGS)
pkglib_LTLIBRARIES += iptables.la
iptables_la_SOURCES = iptables.c
iptables_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBIPTC_CPPFLAGS)
-iptables_la_LDFLAGS = -module -avoid-version
$(BUILD_WITH_LIBIPTC_LDFLAGS)
-iptables_la_LIBADD =
-liptc
+iptables_la_LDFLAGS = -module -avoid-version
+iptables_la_LIBADD =
$(BUILD_WITH_LIBIPTC_LDFLAGS)
collectd_LDADD += "-dlopen" iptables.la
collectd_DEPENDENCIES += iptables.la
endif
collectd_LDADD += "-dlopen" iptables.la
collectd_DEPENDENCIES += iptables.la
endif
@@
-795,7
+796,7
@@
if BUILD_PLUGIN_NOTIFY_EMAIL
pkglib_LTLIBRARIES += notify_email.la
notify_email_la_SOURCES = notify_email.c
notify_email_la_LDFLAGS = -module -avoid-version
pkglib_LTLIBRARIES += notify_email.la
notify_email_la_SOURCES = notify_email.c
notify_email_la_LDFLAGS = -module -avoid-version
-notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread
-ldl
+notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread
collectd_LDADD += "-dlopen" notify_email.la
collectd_DEPENDENCIES += notify_email.la
endif
collectd_LDADD += "-dlopen" notify_email.la
collectd_DEPENDENCIES += notify_email.la
endif
@@
-890,6
+891,7
@@
perl_la_CFLAGS += -Wno-nonnull
endif
perl_la_LDFLAGS = -module -avoid-version \
$(PERL_LDFLAGS)
endif
perl_la_LDFLAGS = -module -avoid-version \
$(PERL_LDFLAGS)
+perl_la_LIBADD = $(PERL_LIBS)
collectd_LDADD += "-dlopen" perl.la
collectd_DEPENDENCIES += perl.la
endif
collectd_LDADD += "-dlopen" perl.la
collectd_DEPENDENCIES += perl.la
endif
@@
-903,10
+905,9
@@
collectd_DEPENDENCIES += pf.la
endif
if BUILD_PLUGIN_PINBA
endif
if BUILD_PLUGIN_PINBA
-BUILT_SOURCES += pinba.pb-c.c pinba.pb-c.h
-CLEANFILES += pinba.pb-c.c pinba.pb-c.h
pkglib_LTLIBRARIES += pinba.la
pinba_la_SOURCES = pinba.c
pkglib_LTLIBRARIES += pinba.la
pinba_la_SOURCES = pinba.c
+nodist_pinba_la_SOURCES = pinba.pb-c.c pinba.pb-c.h
pinba_la_LDFLAGS = -module -avoid-version
pinba_la_LIBADD = -lprotobuf-c
collectd_LDADD += "-dlopen" pinba.la
pinba_la_LDFLAGS = -module -avoid-version
pinba_la_LIBADD = -lprotobuf-c
collectd_LDADD += "-dlopen" pinba.la
@@
-1103,6
+1104,14
@@
collectd_LDADD += "-dlopen" tail.la
collectd_DEPENDENCIES += tail.la
endif
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
if BUILD_PLUGIN_TAPE
pkglib_LTLIBRARIES += tape.la
tape_la_SOURCES = tape.c
@@
-1343,10
+1352,9
@@
collectd_DEPENDENCIES += write_redis.la
endif
if BUILD_PLUGIN_WRITE_RIEMANN
endif
if BUILD_PLUGIN_WRITE_RIEMANN
-BUILT_SOURCES += riemann.pb-c.c riemann.pb-c.h
-CLEANFILES += riemann.pb-c.c riemann.pb-c.h
pkglib_LTLIBRARIES += write_riemann.la
pkglib_LTLIBRARIES += write_riemann.la
-write_riemann_la_SOURCES = write_riemann.c riemann.pb-c.c
+write_riemann_la_SOURCES = write_riemann.c
+nodist_write_riemann_la_SOURCES = riemann.pb-c.c riemann.pb-c.h
write_riemann_la_LDFLAGS = -module -avoid-version
write_riemann_la_LIBADD = -lprotobuf-c
collectd_LDADD += "-dlopen" write_riemann.la
write_riemann_la_LDFLAGS = -module -avoid-version
write_riemann_la_LIBADD = -lprotobuf-c
collectd_LDADD += "-dlopen" write_riemann.la
@@
-1393,7
+1401,7
@@
dist_man_MANS = collectd.1 \
#collectd_1_SOURCES = collectd.pod
#collectd_1_SOURCES = collectd.pod
-EXTRA_DIST = types.db
pinba.proto riemann.proto
+EXTRA_DIST = types.db
EXTRA_DIST += collectd.conf.pod \
collectd-email.pod \
EXTRA_DIST += collectd.conf.pod \
collectd-email.pod \
@@
-1428,11
+1436,26
@@
EXTRA_DIST += collectd.conf.pod \
echo "$@ has some POD errors!"; false; \
fi
echo "$@ has some POD errors!"; false; \
fi
+# Protocol buffer for the "pinba" plugin.
+EXTRA_DIST += pinba.proto
+if HAVE_PROTOC_C
+CLEANFILES += pinba.pb-c.c pinba.pb-c.h
+BUILT_SOURCES += pinba.pb-c.c pinba.pb-c.h
+
pinba.pb-c.c pinba.pb-c.h: pinba.proto
protoc-c -I$(srcdir) --c_out . $(srcdir)/pinba.proto
pinba.pb-c.c pinba.pb-c.h: pinba.proto
protoc-c -I$(srcdir) --c_out . $(srcdir)/pinba.proto
+endif
+
+# Protocol buffer for the "write_riemann" plugin.
+EXTRA_DIST += riemann.proto
+if HAVE_PROTOC_C
+CLEANFILES += riemann.pb-c.c riemann.pb-c.h
+
+BUILT_SOURCES += riemann.pb-c.c riemann.pb-c.h
riemann.pb-c.c riemann.pb-c.h: riemann.proto
protoc-c -I$(srcdir) --c_out . $(srcdir)/riemann.proto
riemann.pb-c.c riemann.pb-c.h: riemann.proto
protoc-c -I$(srcdir) --c_out . $(srcdir)/riemann.proto
+endif
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)