X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=bec7ca93c832aac06a09e1033da2049e54476f1b;hb=38f1d841840096c00a3d0b57bc2c86b6a256f303;hp=a01176d90e09971ebd65a1f4ddbe2d4b8498ece5;hpb=2e632b0929fb957fd686231658bc2999fdfb4b20;p=collectd.git diff --git a/src/Makefile.am b/src/Makefile.am index a01176d9..bec7ca93 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -53,7 +53,7 @@ endif noinst_LTLIBRARIES += liblatency.la liblatency_la_SOURCES = utils_latency.c utils_latency.h utils_latency_config.c utils_latency_config.h -liblatency_la_LIBADD = daemon/libcommon.la +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 @@ -61,18 +61,19 @@ 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 + utils_cmd_flush.c utils_cmd_flush.h \ + utils_cmd_getthreshold.c utils_cmd_getthreshold.h \ + utils_cmd_getval.c utils_cmd_getval.h \ + utils_cmd_listval.c utils_cmd_listval.h \ + utils_cmd_putnotif.c utils_cmd_putnotif.h \ + utils_cmd_putval.c utils_cmd_putval.h \ + utils_parse_option.c utils_parse_option.h +libcmds_la_LIBADD = daemon/libcommon.la daemon/libmetadata.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 + daemon/libplugin_mock.la noinst_LTLIBRARIES += liblookup.la liblookup_la_SOURCES = utils_vl_lookup.c utils_vl_lookup.h @@ -178,13 +179,11 @@ 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 +amqp_la_SOURCES = amqp.c 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_graphite.la libformat_json.la +amqp_la_LIBADD = $(BUILD_WITH_LIBRABBITMQ_LIBS) \ + libcmds.la libformat_graphite.la libformat_json.la endif if BUILD_PLUGIN_APACHE @@ -334,10 +333,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 @@ -443,12 +443,9 @@ 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 +exec_la_SOURCES = exec.c exec_la_LDFLAGS = $(PLUGIN_LDFLAGS) +exec_la_LIBADD = libcmds.la endif if BUILD_PLUGIN_ETHSTAT @@ -686,10 +683,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 @@ -1072,7 +1070,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 @@ -1114,14 +1112,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 @@ -1215,16 +1217,9 @@ 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 \ - utils_cmd_listval.h utils_cmd_listval.c \ - utils_cmd_putval.h utils_cmd_putval.c \ - utils_cmd_putnotif.h utils_cmd_putnotif.c \ - utils_parse_option.h utils_parse_option.c +unixsock_la_SOURCES = unixsock.c unixsock_la_LDFLAGS = $(PLUGIN_LDFLAGS) +unixsock_la_LIBADD = libcmds.la endif if BUILD_PLUGIN_UPTIME @@ -1315,12 +1310,11 @@ endif if BUILD_PLUGIN_WRITE_KAFKA pkglib_LTLIBRARIES += write_kafka.la write_kafka_la_SOURCES = write_kafka.c \ - utils_cmds.c utils_cmds.h \ - utils_cmd_putval.c utils_cmd_putval.h \ - utils_crc32.c utils_crc32.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_graphite.la libformat_json.la +write_kafka_la_LIBADD = $(BUILD_WITH_LIBRDKAFKA_LIBS) \ + libcmds.la libformat_graphite.la libformat_json.la endif if BUILD_PLUGIN_WRITE_LOG