X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=c04497e57be2ee36b2a365d591802bcdf37d95e3;hb=f65cebb764a2e005148d00311caec48dd2540c20;hp=b6b00a274200b1f150834731c47d6151cd583b27;hpb=61c79ccd8480df2a52158940727e41a80717ae77;p=collectd.git diff --git a/src/Makefile.am b/src/Makefile.am index b6b00a27..c04497e5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,7 +52,8 @@ 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 @@ -333,10 +334,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 @@ -417,9 +419,9 @@ endif if BUILD_PLUGIN_DPDKSTAT pkglib_LTLIBRARIES += dpdkstat.la dpdkstat_la_SOURCES = dpdkstat.c -dpdkstat_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_DPDK_CFLAGS) -dpdkstat_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_DPDK_LDFLAGS) -dpdkstat_la_LIBADD = $(BUILD_WITH_DPDK_LIBS) +dpdkstat_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDPDK_CPPFLAGS) +dpdkstat_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBDPDK_LDFLAGS) +dpdkstat_la_LIBADD = -ldpdk endif if BUILD_PLUGIN_DRBD @@ -685,10 +687,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 @@ -1071,7 +1074,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 @@ -1113,13 +1116,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