X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=c7a6047169f2e9c0cba3398b87446eb3fe34ace4;hb=edd9af8a874ebc9f2a7f02846807229a648917db;hp=babe3f2c0d8623f1e2db3d8cbe30483353eb4d7d;hpb=c3adfd513cf40cdd32ddd159e9cdba989f23a429;p=collectd.git diff --git a/src/Makefile.am b/src/Makefile.am index babe3f2c..c7a60471 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,6 +17,12 @@ endif AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"' AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"' +LOG_COMPILER = env VALGRIND="@VALGRIND@" $(abs_top_srcdir)/testwrapper.sh + +V_PROTOC = $(v_protoc_@AM_V@) +v_protoc_ = $(v_protoc_@AM_DEFAULT_V@) +v_protoc_0 = @echo " PROTOC " $@; + noinst_LTLIBRARIES = check_PROGRAMS = TESTS = @@ -85,6 +91,7 @@ collectd_tg_CPPFLAGS = $(AM_CPPFLAGS) \ -I$(top_srcdir)/src/libcollectdclient/collectd \ -I$(top_builddir)/src/libcollectdclient/collectd collectd_tg_LDADD = \ + $(PTHREAD_LIBS) \ daemon/libheap.la \ libcollectdclient/libcollectdclient.la if BUILD_WITH_LIBSOCKET @@ -96,9 +103,6 @@ endif if BUILD_AIX collectd_tg_LDADD += -lm endif -if BUILD_WITH_LIBPTHREAD -collectd_tg_LDADD += $(PTHREAD_LIBS) -endif pkglib_LTLIBRARIES = @@ -106,6 +110,24 @@ pkglib_LTLIBRARIES = BUILT_SOURCES = CLEANFILES = +if HAVE_PROTOC3 +if HAVE_GRPC_CPP +BUILT_SOURCES += collectd.grpc.pb.cc collectd.pb.cc types.pb.cc +CLEANFILES += collectd.grpc.pb.cc collectd.pb.cc types.pb.cc \ + collectd.grpc.pb.h collectd.pb.h types.pb.h + +collectd.grpc.pb.cc: $(top_srcdir)/proto/collectd.proto $(top_srcdir)/proto/types.proto + $(V_PROTOC)@PROTOC@ -I$(top_srcdir)/proto \ + --grpc_out=$(builddir) --plugin=protoc-gen-grpc=$(GRPC_CPP_PLUGIN) $< + +collectd.pb.cc: $(top_srcdir)/proto/collectd.proto $(top_srcdir)/proto/types.proto + $(V_PROTOC)@PROTOC@ -I$(top_srcdir)/proto --cpp_out=$(builddir) $< + +types.pb.cc: $(top_srcdir)/proto/types.proto + $(V_PROTOC)@PROTOC@ -I$(top_srcdir)/proto --cpp_out=$(builddir) $< +endif +endif + if BUILD_PLUGIN_AGGREGATION pkglib_LTLIBRARIES += aggregation.la aggregation_la_SOURCES = aggregation.c \ @@ -208,6 +230,12 @@ cgroups_la_LDFLAGS = $(PLUGIN_LDFLAGS) cgroups_la_LIBADD = libmount.la endif +if BUILD_PLUGIN_CHRONY +pkglib_LTLIBRARIES += chrony.la +chrony_la_SOURCES = chrony.c +chrony_la_LDFLAGS = $(PLUGIN_LDFLAGS) +endif + if BUILD_PLUGIN_CONNTRACK pkglib_LTLIBRARIES += conntrack.la conntrack_la_SOURCES = conntrack.c @@ -335,7 +363,7 @@ if BUILD_PLUGIN_DNS pkglib_LTLIBRARIES += dns.la dns_la_SOURCES = dns.c utils_dns.c utils_dns.h dns_la_LDFLAGS = $(PLUGIN_LDFLAGS) -dns_la_LIBADD = $(PTHREAD_LIBS) -lpcap +dns_la_LIBADD = -lpcap endif if BUILD_PLUGIN_DRBD @@ -348,7 +376,6 @@ if BUILD_PLUGIN_EMAIL pkglib_LTLIBRARIES += email.la email_la_SOURCES = email.c email_la_LDFLAGS = $(PLUGIN_LDFLAGS) -email_la_LIBADD = $(PTHREAD_LIBS) endif if BUILD_PLUGIN_ENTROPY @@ -364,7 +391,6 @@ exec_la_SOURCES = exec.c \ utils_cmd_putval.c utils_cmd_putval.h \ utils_parse_option.h utils_parse_option.c exec_la_LDFLAGS = $(PLUGIN_LDFLAGS) -exec_la_LIBADD = $(PTHREAD_LIBS) endif if BUILD_PLUGIN_ETHSTAT @@ -393,6 +419,16 @@ gmond_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(GANGLIA_LDFLAGS) gmond_la_LIBADD = $(GANGLIA_LIBS) endif +if BUILD_PLUGIN_GRPC +pkglib_LTLIBRARIES += grpc.la +grpc_la_SOURCES = grpc.cc +nodist_grpc_la_SOURCES = collectd.grpc.pb.cc collectd.pb.cc types.pb.cc +grpc_la_CPPFLAGS = $(AM_CPPFLAGS) -std=c++11 +grpc_la_CXXFLAGS = $(AM_CXXFLAGS) -std=c++11 +grpc_la_LDFLAGS = $(PLUGIN_LDFLAGS) +grpc_la_LIBADD = -lgrpc++ -lgrpc -lgpr -lprotobuf +endif + if BUILD_PLUGIN_HDDTEMP pkglib_LTLIBRARIES += hddtemp.la hddtemp_la_SOURCES = hddtemp.c @@ -469,7 +505,7 @@ java_la_SOURCES = java.c java_la_CPPFLAGS = $(AM_CPPFLAGS) $(JAVA_CPPFLAGS) java_la_CFLAGS = $(AM_CFLAGS) $(JAVA_CFLAGS) java_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(JAVA_LDFLAGS) -java_la_LIBADD = $(PTHREAD_LIBS) $(JAVA_LIBS) +java_la_LIBADD = $(JAVA_LIBS) endif if BUILD_PLUGIN_LOAD @@ -667,7 +703,7 @@ network_la_SOURCES = network.c network.h \ utils_fbhash.c utils_fbhash.h network_la_CPPFLAGS = $(AM_CPPFLAGS) network_la_LDFLAGS = $(PLUGIN_LDFLAGS) -network_la_LIBADD = $(PTHREAD_LIBS) +network_la_LIBADD = if BUILD_WITH_LIBSOCKET network_la_LIBADD += -lsocket endif @@ -710,7 +746,7 @@ if BUILD_PLUGIN_NOTIFY_EMAIL pkglib_LTLIBRARIES += notify_email.la notify_email_la_SOURCES = notify_email.c notify_email_la_LDFLAGS = $(PLUGIN_LDFLAGS) -notify_email_la_LIBADD = $(PTHREAD_LIBS) -lesmtp -lssl -lcrypto +notify_email_la_LIBADD = -lesmtp -lssl -lcrypto endif if BUILD_PLUGIN_NOTIFY_NAGIOS @@ -740,7 +776,7 @@ pkglib_LTLIBRARIES += nut.la nut_la_SOURCES = nut.c nut_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBUPSCLIENT_CFLAGS) nut_la_LDFLAGS = $(PLUGIN_LDFLAGS) -nut_la_LIBADD = $(PTHREAD_LIBS) $(BUILD_WITH_LIBUPSCLIENT_LIBS) +nut_la_LIBADD = $(BUILD_WITH_LIBUPSCLIENT_LIBS) endif if BUILD_PLUGIN_OLSRD @@ -943,16 +979,13 @@ if BUILD_WITH_LIBNETSNMP snmp_la_CFLAGS += $(BUILD_WITH_LIBSNMP_CFLAGS) snmp_la_LIBADD += $(BUILD_WITH_LIBSNMP_LIBS) endif -if BUILD_WITH_LIBPTHREAD -snmp_la_LIBADD += $(PTHREAD_LIBS) -endif endif if BUILD_PLUGIN_STATSD pkglib_LTLIBRARIES += statsd.la statsd_la_SOURCES = statsd.c statsd_la_LDFLAGS = $(PLUGIN_LDFLAGS) -statsd_la_LIBADD = $(PTHREAD_LIBS) liblatency.la -lm +statsd_la_LIBADD = liblatency.la -lm endif if BUILD_PLUGIN_SWAP @@ -1103,7 +1136,6 @@ unixsock_la_SOURCES = unixsock.c \ utils_cmd_putnotif.h utils_cmd_putnotif.c \ utils_parse_option.h utils_parse_option.c unixsock_la_LDFLAGS = $(PLUGIN_LDFLAGS) -unixsock_la_LIBADD = $(PTHREAD_LIBS) endif if BUILD_PLUGIN_UPTIME @@ -1249,7 +1281,8 @@ endif if BUILD_PLUGIN_XENCPU pkglib_LTLIBRARIES += xencpu.la xencpu_la_SOURCES = xencpu.c -xencpu_la_LDFLAGS = $(PLUGIN_LDFLAGS) +xencpu_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBXENCTL_CPPFLAGS) +xencpu_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBXENCTL_LDFLAGS) xencpu_la_LIBADD = -lxenctrl endif @@ -1264,17 +1297,12 @@ endif if BUILD_PLUGIN_ZFS_ARC pkglib_LTLIBRARIES += zfs_arc.la zfs_arc_la_SOURCES = zfs_arc.c -zfs_arc_la_CFLAGS = $(AM_CFLAGS) zfs_arc_la_LDFLAGS = $(PLUGIN_LDFLAGS) if BUILD_FREEBSD zfs_arc_la_LIBADD = -lm -else -if BUILD_LINUX -# zfs_arc requires no library on linux -else -# solaris -zfs_arc_la_LIBADD = -lkstat endif +if BUILD_SOLARIS +zfs_arc_la_LIBADD = -lkstat endif endif @@ -1289,7 +1317,6 @@ BUILT_SOURCES += $(dist_man_MANS) if BUILD_PLUGIN_ZONE pkglib_LTLIBRARIES += zone.la zone_la_SOURCES = zone.c -zone_la_CFLAGS = $(AM_CFLAGS) zone_la_LDFLAGS = $(PLUGIN_LDFLAGS) endif @@ -1309,11 +1336,7 @@ dist_man_MANS = collectd.1 \ collectd-unixsock.5 \ types.db.5 -#collectd_1_SOURCES = collectd.pod - -EXTRA_DIST = types.db - -EXTRA_DIST += collectd.conf.pod \ +EXTRA_DIST = collectd.conf.pod \ collectd-email.pod \ collectd-exec.pod \ collectdctl.pod \ @@ -1328,10 +1351,17 @@ EXTRA_DIST += collectd.conf.pod \ collectd-threshold.pod \ collectd-unixsock.pod \ postgresql_default.conf \ - types.db.pod + types.db \ + types.db.pod \ + valgrind.FreeBSD.suppress + +AM_V_POD2MAN_C = $(am__v_POD2MAN_C_@AM_V@) +am__v_POD2MAN_C_ = $(am__v_POD2MAN_C_@AM_DEFAULT_V@) +am__v_POD2MAN_C_0 = @echo " POD2MAN " $@; +am__v_POD2MAN_C_1 = .pod.1: - pod2man --release=$(VERSION) --center=$(PACKAGE) $< \ + $(AM_V_POD2MAN_C)pod2man --release=$(VERSION) --center=$(PACKAGE) $< \ >.pod2man.tmp.$$$$ 2>/dev/null && mv -f .pod2man.tmp.$$$$ $@ || true @if grep '\' $@ >/dev/null 2>&1; \ then \ @@ -1339,7 +1369,7 @@ EXTRA_DIST += collectd.conf.pod \ fi .pod.5: - pod2man --section=5 --release=$(VERSION) --center=$(PACKAGE) $< \ + $(AM_V_POD2MAN_C)pod2man --section=5 --release=$(VERSION) --center=$(PACKAGE) $< \ >.pod2man.tmp.$$$$ 2>/dev/null && mv -f .pod2man.tmp.$$$$ $@ || true @if grep '\' $@ >/dev/null 2>&1; \ then \ @@ -1348,7 +1378,7 @@ EXTRA_DIST += collectd.conf.pod \ AM_V_PROTOC_C = $(am__v_PROTOC_C_@AM_V@) am__v_PROTOC_C_ = $(am__v_PROTOC_C_@AM_DEFAULT_V@) -am__v_PROTOC_C_0 = @echo " PROTOC-C " $@; +am__v_PROTOC_C_0 = @echo " PROTOC-C" $@; am__v_PROTOC_C_1 = # Protocol buffer for the "pinba" plugin.