X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2FMakefile.am;h=a693affc18440e63619e8bbdc9fee1421378ea95;hp=37160c108013b7a1091988b72abad282c53db6e4;hb=865f2eb31e8264edd9337bc63ac59f6c2fa3b5a7;hpb=8476effff293409ad4cb53d87af453ebbb61a064 diff --git a/src/Makefile.am b/src/Makefile.am index 37160c10..a693affc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,4 @@ -SUBDIRS = libcollectdclient -if BUILD_WITH_OWN_LIBOCONFIG -SUBDIRS += liboconfig -endif -SUBDIRS += daemon +SUBDIRS = libcollectdclient liboconfig daemon PLUGIN_LDFLAGS = -module -avoid-version -export-symbols-regex '\' @@ -27,6 +23,15 @@ noinst_LTLIBRARIES = check_PROGRAMS = TESTS = +noinst_LTLIBRARIES += libformat_graphite.la +libformat_graphite_la_SOURCES = utils_format_graphite.c utils_format_graphite.h +libformat_graphite_la_CPPFLAGS = $(AM_CPPFLAGS) +libformat_graphite_la_LDFLAGS = $(AM_LDFLAGS) +check_PROGRAMS += test_format_graphite +TESTS += test_format_graphite +test_format_graphite_SOURCES = utils_format_graphite_test.c testing.h +test_format_graphite_LDADD = libformat_graphite.la daemon/libmetadata.la daemon/libplugin_mock.la -lm + noinst_LTLIBRARIES += libformat_json.la libformat_json_la_SOURCES = utils_format_json.c utils_format_json.h libformat_json_la_CPPFLAGS = $(AM_CPPFLAGS) @@ -43,12 +48,28 @@ test_format_json_LDADD = libformat_json.la daemon/libmetadata.la daemon/libplugi endif noinst_LTLIBRARIES += liblatency.la -liblatency_la_SOURCES = utils_latency.c utils_latency.h +liblatency_la_SOURCES = utils_latency.c utils_latency.h utils_latency_config.c utils_latency_config.h +liblatency_la_LIBADD = daemon/libcommon.la -lm check_PROGRAMS += test_utils_latency TESTS += test_utils_latency test_utils_latency_SOURCES = utils_latency_test.c testing.h test_utils_latency_LDADD = liblatency.la daemon/libplugin_mock.la -lm +noinst_LTLIBRARIES += libcmds.la +libcmds_la_SOURCES = utils_cmds.c utils_cmds.h \ + utils_cmd_flush.c utils_cmd_flush.h \ + utils_cmd_getval.c utils_cmd_getval.h \ + utils_cmd_listval.c utils_cmd_listval.h \ + utils_cmd_putval.c utils_cmd_putval.h \ + utils_parse_option.c +libcmds_la_LIBADD = daemon/libcommon.la daemon/libmetadata.la \ + daemon/libplugin_mock.la -lm +check_PROGRAMS += test_utils_cmds +TESTS += test_utils_cmds +test_utils_cmds_SOURCES = utils_cmds_test.c testing.h +test_utils_cmds_LDADD = libcmds.la \ + daemon/libplugin_mock.la daemon/libmetadata.la + noinst_LTLIBRARIES += liblookup.la liblookup_la_SOURCES = utils_vl_lookup.c utils_vl_lookup.h liblookup_la_LIBADD = daemon/libavltree.la @@ -154,12 +175,12 @@ endif if BUILD_PLUGIN_AMQP pkglib_LTLIBRARIES += amqp.la amqp_la_SOURCES = amqp.c \ + utils_cmds.c utils_cmds.h \ utils_cmd_putval.c utils_cmd_putval.h \ - utils_parse_option.c utils_parse_option.h \ - utils_format_graphite.c utils_format_graphite.h + utils_parse_option.c utils_parse_option.h amqp_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRABBITMQ_LDFLAGS) amqp_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBRABBITMQ_CPPFLAGS) -amqp_la_LIBADD = $(BUILD_WITH_LIBRABBITMQ_LIBS) libformat_json.la +amqp_la_LIBADD = $(BUILD_WITH_LIBRABBITMQ_LIBS) libformat_graphite.la libformat_json.la endif if BUILD_PLUGIN_APACHE @@ -213,7 +234,7 @@ endif if BUILD_PLUGIN_BATTERY pkglib_LTLIBRARIES += battery.la -battery_la_SOURCES = battery.c +battery_la_SOURCES = battery.c battery_statefs.c battery_la_LDFLAGS = $(PLUGIN_LDFLAGS) if BUILD_WITH_LIBIOKIT battery_la_LDFLAGS += -framework IOKit @@ -309,10 +330,11 @@ endif if BUILD_PLUGIN_CURL pkglib_LTLIBRARIES += curl.la curl_la_SOURCES = curl.c \ - utils_curl_stats.c utils_curl_stats.h + utils_curl_stats.c utils_curl_stats.h \ + utils_match.c utils_match.h curl_la_LDFLAGS = $(PLUGIN_LDFLAGS) curl_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS) -curl_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) +curl_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) liblatency.la endif if BUILD_PLUGIN_CURL_JSON @@ -355,6 +377,7 @@ if BUILD_PLUGIN_DISK pkglib_LTLIBRARIES += disk.la disk_la_SOURCES = disk.c disk_la_CFLAGS = $(AM_CFLAGS) +disk_la_CPPFLAGS = $(AM_CPPFLAGS) disk_la_LDFLAGS = $(PLUGIN_LDFLAGS) disk_la_LIBADD = if BUILD_WITH_LIBKSTAT @@ -371,7 +394,7 @@ disk_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS) disk_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) endif if BUILD_WITH_LIBUDEV -disk_la_CFLAGS += $(BUILD_WITH_LIBUDEV_CFLAGS) +disk_la_CPPFLAGS += $(BUILD_WITH_LIBUDEV_CPPFLAGS) disk_la_LDFLAGS += $(BUILD_WITH_LIBUDEV_LDFLAGS) disk_la_LIBADD += $(BUILD_WITH_LIBUDEV_LIBS) endif @@ -386,8 +409,17 @@ endif 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 = -lpcap +dns_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBPCAP_CPPFLAGS) +dns_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBPCAP_LDFLAGS) +dns_la_LIBADD = $(BUILD_WITH_LIBPCAP_LIBS) +endif + +if BUILD_PLUGIN_DPDKSTAT +pkglib_LTLIBRARIES += dpdkstat.la +dpdkstat_la_SOURCES = dpdkstat.c +dpdkstat_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDPDK_CPPFLAGS) +dpdkstat_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBDPDK_LDFLAGS) +dpdkstat_la_LIBADD = -ldpdk endif if BUILD_PLUGIN_DRBD @@ -411,6 +443,7 @@ endif if BUILD_PLUGIN_EXEC pkglib_LTLIBRARIES += exec.la exec_la_SOURCES = exec.c \ + utils_cmds.c utils_cmds.h \ utils_cmd_putnotif.c utils_cmd_putnotif.h \ utils_cmd_putval.c utils_cmd_putval.h \ utils_parse_option.h utils_parse_option.c @@ -470,6 +503,12 @@ hddtemp_la_LIBADD += -lsocket endif endif +if BUILD_PLUGIN_HUGEPAGES +pkglib_LTLIBRARIES += hugepages.la +hugepages_la_SOURCES = hugepages.c +hugepages_la_LDFLAGS = $(PLUGIN_LDFLAGS) +endif + if BUILD_PLUGIN_INTERFACE pkglib_LTLIBRARIES += interface.la interface_la_SOURCES = interface.c @@ -646,10 +685,11 @@ endif if BUILD_PLUGIN_MEMCACHEC pkglib_LTLIBRARIES += memcachec.la -memcachec_la_SOURCES = memcachec.c +memcachec_la_SOURCES = memcachec.c \ + utils_match.c utils_match.h memcachec_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBMEMCACHED_LDFLAGS) memcachec_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBMEMCACHED_CPPFLAGS) -memcachec_la_LIBADD = $(BUILD_WITH_LIBMEMCACHED_LIBS) +memcachec_la_LIBADD = $(BUILD_WITH_LIBMEMCACHED_LIBS) liblatency.la endif if BUILD_PLUGIN_MEMCACHED @@ -686,9 +726,9 @@ endif if BUILD_PLUGIN_MIC pkglib_LTLIBRARIES += mic.la mic_la_SOURCES = mic.c -mic_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_MIC_LIBPATH) -mic_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_MIC_CPPFLAGS) -mic_la_LIBADD = $(BUILD_WITH_MIC_LDADD) +mic_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_MIC_CPPFLAGS) +mic_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_MIC_LDFLAGS) +mic_la_LIBADD = $(BUILD_WITH_MIC_LIBS) endif if BUILD_PLUGIN_MODBUS @@ -785,8 +825,9 @@ endif 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 = -lesmtp -lssl -lcrypto +notify_email_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBESMTP_CPPFLAGS) +notify_email_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBESMTP_LDFLAGS) +notify_email_la_LIBADD = $(BUILD_WITH_LIBESMTP_LIBS) endif if BUILD_PLUGIN_NOTIFY_NAGIOS @@ -873,11 +914,6 @@ perl_la_CPPFLAGS += -D_GNU_SOURCE perl_la_CFLAGS = $(AM_CFLAGS) \ $(PERL_CFLAGS) \ -DXS_VERSION=\"$(VERSION)\" -DVERSION=\"$(VERSION)\" -# Work-around for issues #41 and #42 - Perl 5.10 incorrectly introduced -# __attribute__nonnull__(3) for Perl_load_module(). -if HAVE_BROKEN_PERL_LOAD_MODULE -perl_la_CFLAGS += -Wno-nonnull -endif perl_la_LDFLAGS = $(PLUGIN_LDFLAGS) \ $(PERL_LDFLAGS) perl_la_LIBADD = $(PERL_LIBS) @@ -913,7 +949,7 @@ postgresql_la_SOURCES = postgresql.c \ postgresql_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBPQ_CPPFLAGS) postgresql_la_LDFLAGS = $(PLUGIN_LDFLAGS) \ $(BUILD_WITH_LIBPQ_LDFLAGS) -postgresql_la_LIBADD = -lpq +postgresql_la_LIBADD = $(BUILD_WITH_LIBPQ_LIBS) endif if BUILD_PLUGIN_POWERDNS @@ -948,6 +984,14 @@ protocols_la_SOURCES = protocols.c protocols_la_LDFLAGS = $(PLUGIN_LDFLAGS) endif +if BUILD_PLUGIN_INTEL_RDT +pkglib_LTLIBRARIES += intel_rdt.la +intel_rdt_la_SOURCES = intel_rdt.c +intel_rdt_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBPQOS_LDFLAGS) +intel_rdt_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBPQOS_CPPFLAGS) +intel_rdt_la_LIBADD = $(BUILD_WITH_LIBPQOS_LIBS) +endif + if BUILD_PLUGIN_REDIS pkglib_LTLIBRARIES += redis.la redis_la_SOURCES = redis.c @@ -983,9 +1027,9 @@ endif if BUILD_PLUGIN_SENSORS pkglib_LTLIBRARIES += sensors.la sensors_la_SOURCES = sensors.c -sensors_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBSENSORS_CFLAGS) +sensors_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBSENSORS_CPPFLAGS) sensors_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBSENSORS_LDFLAGS) -sensors_la_LIBADD = -lsensors +sensors_la_LIBADD = $(BUILD_WITH_LIBSENSORS_LIBS) endif if BUILD_PLUGIN_SERIAL @@ -1006,7 +1050,7 @@ if BUILD_PLUGIN_SMART if BUILD_WITH_LIBUDEV pkglib_LTLIBRARIES += smart.la smart_la_SOURCES = smart.c -smart_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBATASMART_CPPFLAGS) $(BUILD_WITH_LIBUDEV_CFLAGS) +smart_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBATASMART_CPPFLAGS) $(BUILD_WITH_LIBUDEV_CPPFLAGS) smart_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBATASMART_LDFLAGS) $(BUILD_WITH_LIBUDEV_LDFLAGS) smart_la_LIBADD = $(BUILD_WITH_LIBATASMART_LIBS) $(BUILD_WITH_LIBUDEV_LIBS) endif @@ -1024,7 +1068,7 @@ if BUILD_PLUGIN_STATSD pkglib_LTLIBRARIES += statsd.la statsd_la_SOURCES = statsd.c statsd_la_LDFLAGS = $(PLUGIN_LDFLAGS) -statsd_la_LIBADD = liblatency.la -lm +statsd_la_LIBADD = liblatency.la endif if BUILD_PLUGIN_SWAP @@ -1066,13 +1110,18 @@ endif if BUILD_PLUGIN_TAIL pkglib_LTLIBRARIES += tail.la -tail_la_SOURCES = tail.c +tail_la_SOURCES = tail.c \ + utils_match.c utils_match.h \ + utils_tail.c utils_tail.h \ + utils_tail_match.c utils_tail_match.h tail_la_LDFLAGS = $(PLUGIN_LDFLAGS) +tail_la_LIBADD = liblatency.la endif if BUILD_PLUGIN_TAIL_CSV pkglib_LTLIBRARIES += tail_csv.la -tail_csv_la_SOURCES = tail_csv.c +tail_csv_la_SOURCES = tail_csv.c \ + utils_tail.c utils_tail.h tail_csv_la_LDFLAGS = $(PLUGIN_LDFLAGS) endif @@ -1167,6 +1216,7 @@ endif if BUILD_PLUGIN_UNIXSOCK pkglib_LTLIBRARIES += unixsock.la unixsock_la_SOURCES = unixsock.c \ + utils_cmds.c utils_cmds.h \ utils_cmd_flush.h utils_cmd_flush.c \ utils_cmd_getval.h utils_cmd_getval.c \ utils_cmd_getthreshold.h utils_cmd_getthreshold.c \ @@ -1226,6 +1276,19 @@ virt_la_CFLAGS = $(AM_CFLAGS) \ $(BUILD_WITH_LIBVIRT_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) virt_la_LIBADD = $(BUILD_WITH_LIBVIRT_LIBS) $(BUILD_WITH_LIBXML2_LIBS) virt_la_LDFLAGS = $(PLUGIN_LDFLAGS) + +# TODO: enable once we support only modern libvirts which depends on libnl-3 +# the libvirt on wheezy is linked in libnl v1, and there is a small leak here, +# triggered by the library initialization. There are no means to avoid it, +# and libvirt switched to libnl3 anyway +#test_plugin_virt_SOURCES = virt_test.c +#test_plugin_virt_CPPFLAGS = $(AM_CPPFLAGS) \ +# $(BUILD_WITH_LIBVIRT_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) +#test_plugin_virt_LDFLAGS = $(PLUGIN_LDFLAGS) +#test_plugin_virt_LDADD = daemon/libplugin_mock.la \ +# $(BUILD_WITH_LIBVIRT_LIBS) $(BUILD_WITH_LIBXML2_LIBS) +#check_PROGRAMS += test_plugin_virt +#TESTS += test_plugin_virt endif if BUILD_PLUGIN_VMEM @@ -1248,9 +1311,9 @@ endif if BUILD_PLUGIN_WRITE_GRAPHITE pkglib_LTLIBRARIES += write_graphite.la -write_graphite_la_SOURCES = write_graphite.c \ - utils_format_graphite.c utils_format_graphite.h +write_graphite_la_SOURCES = write_graphite.c write_graphite_la_LDFLAGS = $(PLUGIN_LDFLAGS) +write_graphite_la_LIBADD = libformat_graphite.la endif if BUILD_PLUGIN_WRITE_HTTP @@ -1265,19 +1328,19 @@ endif if BUILD_PLUGIN_WRITE_KAFKA pkglib_LTLIBRARIES += write_kafka.la write_kafka_la_SOURCES = write_kafka.c \ - utils_format_graphite.c utils_format_graphite.h \ + utils_cmds.c utils_cmds.h \ utils_cmd_putval.c utils_cmd_putval.h \ utils_crc32.c utils_crc32.h write_kafka_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBRDKAFKA_CPPFLAGS) write_kafka_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRDKAFKA_LDFLAGS) -write_kafka_la_LIBADD = $(BUILD_WITH_LIBRDKAFKA_LIBS) libformat_json.la +write_kafka_la_LIBADD = $(BUILD_WITH_LIBRDKAFKA_LIBS) libformat_graphite.la libformat_json.la endif if BUILD_PLUGIN_WRITE_LOG pkglib_LTLIBRARIES += write_log.la -write_log_la_SOURCES = write_log.c \ - utils_format_graphite.c utils_format_graphite.h +write_log_la_SOURCES = write_log.c write_log_la_LDFLAGS = $(PLUGIN_LDFLAGS) +write_log_la_LIBADD = libformat_graphite.la libformat_json.la endif if BUILD_PLUGIN_WRITE_MONGODB @@ -1288,6 +1351,15 @@ write_mongodb_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBMONGOC_LDFLAGS) write_mongodb_la_LIBADD = -lmongoc endif +if BUILD_PLUGIN_WRITE_PROMETHEUS +pkglib_LTLIBRARIES += write_prometheus.la +write_prometheus_la_SOURCES = write_prometheus.c +nodist_write_prometheus_la_SOURCES = prometheus.pb-c.c prometheus.pb-c.h +write_prometheus_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBPROTOBUF_C_CPPFLAGS) $(BUILD_WITH_LIBMICROHTTPD_CPPFLAGS) +write_prometheus_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBPROTOBUF_C_LDFLAGS) $(BUILD_WITH_LIBMICROHTTPD_LDFLAGS) +write_prometheus_la_LIBADD = $(BUILD_WITH_LIBPROTOBUF_C_LIBS) $(BUILD_WITH_LIBMICROHTTPD_LIBS) +endif + if BUILD_PLUGIN_WRITE_REDIS pkglib_LTLIBRARIES += write_redis.la write_redis_la_SOURCES = write_redis.c @@ -1430,6 +1502,15 @@ pinba.pb-c.c pinba.pb-c.h: pinba.proto $(AM_V_PROTOC_C)$(PROTOC_C) -I$(srcdir) --c_out . $(srcdir)/pinba.proto endif +# Protocol buffer for the "write_prometheus" plugin. +if BUILD_PLUGIN_WRITE_PROMETHEUS +CLEANFILES += prometheus.pb-c.c prometheus.pb-c.h +BUILT_SOURCES += prometheus.pb-c.c prometheus.pb-c.h + +prometheus.pb-c.c prometheus.pb-c.h: $(top_srcdir)/proto/prometheus.proto + $(AM_V_PROTOC_C)$(PROTOC_C) -I$(top_srcdir)/proto --c_out=$(builddir) $(top_srcdir)/proto/prometheus.proto +endif + install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(sysconfdir) if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \