X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Makefile.am;h=65c821559eada77e68c65773aa2dad44602ac3fb;hb=1d429f78567323c11f00e9f6e5ea1765e7c5c8c7;hp=76008d4c9fad6aca95fbb92c28c5da66a5d5414e;hpb=38176b313b5aaa94ba2b922c2c5fd18c892a92f9;p=collectd.git diff --git a/Makefile.am b/Makefile.am index 76008d4c..65c82155 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,9 +89,12 @@ nodist_pkgconfig_DATA = \ pkginclude_HEADERS = \ src/libcollectdclient/collectd/client.h \ - src/libcollectdclient/collectd/network.h \ + src/libcollectdclient/collectd/lcc_features.h \ src/libcollectdclient/collectd/network_buffer.h \ - src/libcollectdclient/collectd/lcc_features.h + src/libcollectdclient/collectd/network.h \ + src/libcollectdclient/collectd/network_parse.h \ + src/libcollectdclient/collectd/server.h \ + src/libcollectdclient/collectd/types.h lib_LTLIBRARIES = libcollectdclient.la @@ -133,7 +136,8 @@ check_PROGRAMS = \ test_utils_mount \ test_utils_subst \ test_utils_time \ - test_utils_vl_lookup + test_utils_vl_lookup \ + test_libcollectd_network_parse TESTS = $(check_PROGRAMS) @@ -244,8 +248,8 @@ collectdmon_SOURCES = src/collectdmon.c collectd_nagios_SOURCES = src/collectd-nagios.c collectd_nagios_CPPFLAGS = $(AM_CPPFLAGS) \ - -I$(srcdir)/src/libcollectdclient/collectd \ - -I$(top_builddir)/src/libcollectdclient/collectd + -I$(srcdir)/src/libcollectdclient \ + -I$(top_builddir)/src/libcollectdclient collectd_nagios_LDADD = libcollectdclient.la if BUILD_WITH_LIBSOCKET collectd_nagios_LDADD += -lsocket @@ -257,8 +261,8 @@ endif collectdctl_SOURCES = src/collectdctl.c collectdctl_CPPFLAGS = $(AM_CPPFLAGS) \ - -I$(srcdir)/src/libcollectdclient/collectd \ - -I$(top_builddir)/src/libcollectdclient/collectd + -I$(srcdir)/src/libcollectdclient \ + -I$(top_builddir)/src/libcollectdclient collectdctl_LDADD = libcollectdclient.la if BUILD_WITH_LIBSOCKET collectdctl_LDADD += -lsocket @@ -270,8 +274,8 @@ endif collectd_tg_SOURCES = src/collectd-tg.c collectd_tg_CPPFLAGS = $(AM_CPPFLAGS) \ - -I$(srcdir)/src/libcollectdclient/collectd \ - -I$(top_builddir)/src/libcollectdclient/collectd + -I$(srcdir)/src/libcollectdclient \ + -I$(top_builddir)/src/libcollectdclient collectd_tg_LDADD = \ $(PTHREAD_LIBS) \ libheap.la \ @@ -471,28 +475,42 @@ endif libcollectdclient_la_SOURCES = \ src/libcollectdclient/client.c \ src/libcollectdclient/network.c \ - src/libcollectdclient/network_buffer.c + src/libcollectdclient/network_buffer.c \ + src/libcollectdclient/network_parse.c \ + src/libcollectdclient/server.c libcollectdclient_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -I$(srcdir)/src/libcollectdclient/collectd \ - -I$(top_builddir)/src/libcollectdclient/collectd \ + -I$(srcdir)/src/libcollectdclient \ + -I$(top_builddir)/src/libcollectdclient \ -I$(srcdir)/src/daemon -libcollectdclient_la_LDFLAGS = -version-info 1:0:0 -libcollectdclient_la_LIBADD = +libcollectdclient_la_LDFLAGS = -version-info 2:0:1 +libcollectdclient_la_LIBADD = -lm if BUILD_WITH_LIBGCRYPT libcollectdclient_la_CPPFLAGS += $(GCRYPT_CPPFLAGS) libcollectdclient_la_LDFLAGS += $(GCRYPT_LDFLAGS) libcollectdclient_la_LIBADD += $(GCRYPT_LIBS) endif +# network_parse_test.c includes network_parse.c, so no need to link with +# libcollectdclient.so. +test_libcollectd_network_parse_SOURCES = src/libcollectdclient/network_parse_test.c +test_libcollectd_network_parse_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I$(srcdir)/src/libcollectdclient \ + -I$(top_builddir)/src/libcollectdclient +if BUILD_WITH_LIBGCRYPT +test_libcollectd_network_parse_CPPFLAGS += $(GCRYPT_CPPFLAGS) +test_libcollectd_network_parse_LDFLAGS = $(GCRYPT_LDFLAGS) +test_libcollectd_network_parse_LDADD = $(GCRYPT_LIBS) +endif -liboconfig_la_LDFLAGS = -avoid-version $(LEXLIB) liboconfig_la_SOURCES = \ src/liboconfig/oconfig.c \ src/liboconfig/oconfig.h \ src/liboconfig/aux_types.h \ src/liboconfig/scanner.l \ src/liboconfig/parser.y +liboconfig_la_LDFLAGS = -avoid-version $(LEXLIB) if BUILD_PLUGIN_AGGREGATION @@ -508,8 +526,8 @@ endif if BUILD_PLUGIN_AMQP pkglib_LTLIBRARIES += amqp.la amqp_la_SOURCES = src/amqp.c -amqp_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRABBITMQ_LDFLAGS) amqp_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBRABBITMQ_CPPFLAGS) +amqp_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRABBITMQ_LDFLAGS) amqp_la_LIBADD = \ $(BUILD_WITH_LIBRABBITMQ_LIBS) \ libcmds.la \ @@ -520,8 +538,8 @@ endif if BUILD_PLUGIN_APACHE pkglib_LTLIBRARIES += apache.la apache_la_SOURCES = src/apache.c -apache_la_LDFLAGS = $(PLUGIN_LDFLAGS) apache_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS) +apache_la_LDFLAGS = $(PLUGIN_LDFLAGS) apache_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) endif @@ -553,11 +571,11 @@ endif if BUILD_PLUGIN_ASCENT pkglib_LTLIBRARIES += ascent.la ascent_la_SOURCES = src/ascent.c -ascent_la_LDFLAGS = $(PLUGIN_LDFLAGS) ascent_la_CFLAGS = \ $(AM_CFLAGS) \ $(BUILD_WITH_LIBCURL_CFLAGS) \ $(BUILD_WITH_LIBXML2_CFLAGS) +ascent_la_LDFLAGS = $(PLUGIN_LDFLAGS) ascent_la_LIBADD = \ $(BUILD_WITH_LIBCURL_LIBS) \ $(BUILD_WITH_LIBXML2_LIBS) @@ -584,18 +602,17 @@ endif if BUILD_PLUGIN_BIND pkglib_LTLIBRARIES += bind.la bind_la_SOURCES = src/bind.c -bind_la_LDFLAGS = $(PLUGIN_LDFLAGS) bind_la_CFLAGS = $(AM_CFLAGS) \ - $(BUILD_WITH_LIBCURL_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) + $(BUILD_WITH_LIBCURL_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) +bind_la_LDFLAGS = $(PLUGIN_LDFLAGS) bind_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) $(BUILD_WITH_LIBXML2_LIBS) endif if BUILD_PLUGIN_CEPH pkglib_LTLIBRARIES += ceph.la ceph_la_SOURCES = src/ceph.c -ceph_la_CFLAGS = $(AM_CFLAGS) -ceph_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS) ceph_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS) +ceph_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS) ceph_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS) endif @@ -610,6 +627,7 @@ if BUILD_PLUGIN_CHRONY pkglib_LTLIBRARIES += chrony.la chrony_la_SOURCES = src/chrony.c chrony_la_LDFLAGS = $(PLUGIN_LDFLAGS) +chrony_la_LIBADD = -lm endif if BUILD_PLUGIN_CONNTRACK @@ -675,8 +693,8 @@ curl_la_SOURCES = \ src/utils_curl_stats.h \ src/utils_match.c \ src/utils_match.h -curl_la_LDFLAGS = $(PLUGIN_LDFLAGS) curl_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS) +curl_la_LDFLAGS = $(PLUGIN_LDFLAGS) curl_la_LIBADD = liblatency.la $(BUILD_WITH_LIBCURL_LIBS) endif @@ -698,9 +716,9 @@ curl_xml_la_SOURCES = \ src/curl_xml.c \ src/utils_curl_stats.c \ src/utils_curl_stats.h -curl_xml_la_LDFLAGS = $(PLUGIN_LDFLAGS) curl_xml_la_CFLAGS = $(AM_CFLAGS) \ $(BUILD_WITH_LIBCURL_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) +curl_xml_la_LDFLAGS = $(PLUGIN_LDFLAGS) curl_xml_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) $(BUILD_WITH_LIBXML2_LIBS) endif @@ -766,9 +784,17 @@ dns_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBPCAP_LDFLAGS) dns_la_LIBADD = $(BUILD_WITH_LIBPCAP_LIBS) endif +if BUILD_PLUGIN_DPDKEVENTS +pkglib_LTLIBRARIES += dpdkevents.la +dpdkevents_la_SOURCES = src/dpdkevents.c src/utils_dpdk.c src/utils_dpdk.h +dpdkevents_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDPDK_CPPFLAGS) +dpdkevents_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBDPDK_LDFLAGS) +dpdkevents_la_LIBADD = -ldpdk +endif + if BUILD_PLUGIN_DPDKSTAT pkglib_LTLIBRARIES += dpdkstat.la -dpdkstat_la_SOURCES = src/dpdkstat.c +dpdkstat_la_SOURCES = src/dpdkstat.c src/utils_dpdk.c src/utils_dpdk.h dpdkstat_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDPDK_CPPFLAGS) dpdkstat_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBDPDK_LDFLAGS) dpdkstat_la_LIBADD = -ldpdk @@ -817,6 +843,12 @@ filecount_la_SOURCES = src/filecount.c filecount_la_LDFLAGS = $(PLUGIN_LDFLAGS) endif +if BUILD_PLUGIN_FSCACHE +pkglib_LTLIBRARIES += fscache.la +fscache_la_SOURCES = src/fscache.c +fscache_la_LDFLAGS = $(PLUGIN_LDFLAGS) +endif + if BUILD_PLUGIN_GMOND pkglib_LTLIBRARIES += gmond.la gmond_la_SOURCES = src/gmond.c @@ -864,8 +896,8 @@ endif if BUILD_PLUGIN_INTEL_RDT pkglib_LTLIBRARIES += intel_rdt.la intel_rdt_la_SOURCES = src/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_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBPQOS_LDFLAGS) intel_rdt_la_LIBADD = $(BUILD_WITH_LIBPQOS_LIBS) endif @@ -962,8 +994,8 @@ endif if BUILD_PLUGIN_LOG_LOGSTASH pkglib_LTLIBRARIES += log_logstash.la log_logstash_la_SOURCES = src/log_logstash.c -log_logstash_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS) log_logstash_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS) +log_logstash_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS) log_logstash_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS) endif @@ -1059,8 +1091,8 @@ memcachec_la_SOURCES = \ src/memcachec.c \ src/utils_match.c \ src/utils_match.h -memcachec_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBMEMCACHED_LDFLAGS) memcachec_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBMEMCACHED_CPPFLAGS) +memcachec_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBMEMCACHED_LDFLAGS) memcachec_la_LIBADD = liblatency.la $(BUILD_WITH_LIBMEMCACHED_LIBS) endif @@ -1106,8 +1138,8 @@ endif if BUILD_PLUGIN_MODBUS pkglib_LTLIBRARIES += modbus.la modbus_la_SOURCES = src/modbus.c -modbus_la_LDFLAGS = $(PLUGIN_LDFLAGS) modbus_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMODBUS_CFLAGS) +modbus_la_LDFLAGS = $(PLUGIN_LDFLAGS) modbus_la_LIBADD = $(BUILD_WITH_LIBMODBUS_LIBS) endif @@ -1144,8 +1176,8 @@ endif if BUILD_PLUGIN_NETLINK pkglib_LTLIBRARIES += netlink.la netlink_la_SOURCES = src/netlink.c -netlink_la_LDFLAGS = $(PLUGIN_LDFLAGS) netlink_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMNL_CFLAGS) +netlink_la_LDFLAGS = $(PLUGIN_LDFLAGS) netlink_la_LIBADD = $(BUILD_WITH_LIBMNL_LIBS) endif @@ -1175,12 +1207,6 @@ nfs_la_SOURCES = src/nfs.c nfs_la_LDFLAGS = $(PLUGIN_LDFLAGS) endif -if BUILD_PLUGIN_FSCACHE -pkglib_LTLIBRARIES += fscache.la -fscache_la_SOURCES = src/fscache.c -fscache_la_LDFLAGS = $(PLUGIN_LDFLAGS) -endif - if BUILD_PLUGIN_NGINX pkglib_LTLIBRARIES += nginx.la nginx_la_SOURCES = src/nginx.c @@ -1280,12 +1306,26 @@ endif if BUILD_PLUGIN_OVS_EVENTS pkglib_LTLIBRARIES += ovs_events.la -ovs_events_la_SOURCES = ovs_link.c utils_ovs.c +ovs_events_la_SOURCES = \ + src/ovs_events.c \ + src/utils_ovs.c \ + src/utils_ovs.h +ovs_events_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS) ovs_events_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS) -ovs_events_la_CFLAGS = $(BUILD_WITH_LIBYAJL_CPPFLAGS) ovs_events_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS) endif +if BUILD_PLUGIN_OVS_STATS +pkglib_LTLIBRARIES += ovs_stats.la +ovs_stats_la_SOURCES = \ + src/ovs_stats.c \ + src/utils_ovs.c \ + src/utils_ovs.h +ovs_stats_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS) +ovs_stats_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS) +ovs_stats_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS) +endif + if BUILD_PLUGIN_PERL pkglib_LTLIBRARIES += perl.la perl_la_SOURCES = src/perl.c @@ -1296,11 +1336,10 @@ perl_la_CPPFLAGS = $(AM_CPPFLAGS) -DHAS_BOOL=1 # off64_t which is only exposed when _LARGEFILE64_SOURCE is defined... *sigh* # On older platforms we also need _REENTRANT. _GNU_SOURCE sets both of these. perl_la_CPPFLAGS += -D_GNU_SOURCE -perl_la_CFLAGS = $(AM_CFLAGS) \ - $(PERL_CFLAGS) \ - -DXS_VERSION=\"$(VERSION)\" -DVERSION=\"$(VERSION)\" -perl_la_LDFLAGS = $(PLUGIN_LDFLAGS) \ - $(PERL_LDFLAGS) +perl_la_CFLAGS = $(AM_CFLAGS) \ + $(PERL_CFLAGS) \ + -DXS_VERSION=\"$(VERSION)\" -DVERSION=\"$(VERSION)\" +perl_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(PERL_LDFLAGS) perl_la_LIBADD = $(PERL_LIBS) endif @@ -1337,7 +1376,7 @@ postgresql_la_SOURCES = \ src/utils_db_query.h postgresql_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBPQ_CPPFLAGS) postgresql_la_LDFLAGS = $(PLUGIN_LDFLAGS) \ - $(BUILD_WITH_LIBPQ_LDFLAGS) + $(BUILD_WITH_LIBPQ_LDFLAGS) postgresql_la_LIBADD = $(BUILD_WITH_LIBPQ_LIBS) endif @@ -1380,8 +1419,8 @@ endif if BUILD_PLUGIN_REDIS pkglib_LTLIBRARIES += redis.la redis_la_SOURCES = src/redis.c -redis_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBHIREDIS_LDFLAGS) redis_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBHIREDIS_CPPFLAGS) +redis_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBHIREDIS_LDFLAGS) redis_la_LIBADD = -lhiredis endif @@ -1399,8 +1438,8 @@ rrdcached_la_SOURCES = \ src/rrdcached.c \ src/utils_rrdcreate.c \ src/utils_rrdcreate.h -rrdcached_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRRD_LDFLAGS) rrdcached_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBRRD_CFLAGS) +rrdcached_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRRD_LDFLAGS) rrdcached_la_LIBADD = $(BUILD_WITH_LIBRRD_LIBS) endif @@ -1410,8 +1449,8 @@ rrdtool_la_SOURCES = \ src/rrdtool.c \ src/utils_rrdcreate.c \ src/utils_rrdcreate.h -rrdtool_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRRD_LDFLAGS) rrdtool_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBRRD_CFLAGS) +rrdtool_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBRRD_LDFLAGS) rrdtool_la_LIBADD = $(BUILD_WITH_LIBRRD_LIBS) endif @@ -1614,7 +1653,7 @@ if BUILD_PLUGIN_UNIXSOCK pkglib_LTLIBRARIES += unixsock.la unixsock_la_SOURCES = src/unixsock.c unixsock_la_LDFLAGS = $(PLUGIN_LDFLAGS) -unixsock_la_LIBS = libcmds.la +unixsock_la_LIBADD = libcmds.la endif if BUILD_PLUGIN_UPTIME @@ -1652,8 +1691,8 @@ endif if BUILD_PLUGIN_VARNISH pkglib_LTLIBRARIES += varnish.la varnish_la_SOURCES = src/varnish.c -varnish_la_LDFLAGS = $(PLUGIN_LDFLAGS) varnish_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBVARNISH_CFLAGS) +varnish_la_LDFLAGS = $(PLUGIN_LDFLAGS) varnish_la_LIBADD = $(BUILD_WITH_LIBVARNISH_LIBS) endif @@ -1661,7 +1700,7 @@ if BUILD_PLUGIN_VIRT pkglib_LTLIBRARIES += virt.la virt_la_SOURCES = src/virt.c virt_la_CFLAGS = $(AM_CFLAGS) \ - $(BUILD_WITH_LIBVIRT_CFLAGS) $(BUILD_WITH_LIBXML2_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) @@ -1671,10 +1710,10 @@ virt_la_LDFLAGS = $(PLUGIN_LDFLAGS) # and libvirt switched to libnl3 anyway #test_plugin_virt_SOURCES = src/virt_test.c #test_plugin_virt_CPPFLAGS = $(AM_CPPFLAGS) \ -# $(BUILD_WITH_LIBVIRT_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) +# $(BUILD_WITH_LIBVIRT_CFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS) #test_plugin_virt_LDFLAGS = $(PLUGIN_LDFLAGS) #test_plugin_virt_LDADD = libplugin_mock.la \ -# $(BUILD_WITH_LIBVIRT_LIBS) $(BUILD_WITH_LIBXML2_LIBS) +# $(BUILD_WITH_LIBVIRT_LIBS) $(BUILD_WITH_LIBXML2_LIBS) #check_PROGRAMS += test_plugin_virt #TESTS += test_plugin_virt endif @@ -1710,8 +1749,8 @@ write_http_la_SOURCES = \ src/write_http.c \ src/utils_format_kairosdb.c \ src/utils_format_kairosdb.h -write_http_la_LDFLAGS = $(PLUGIN_LDFLAGS) write_http_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS) +write_http_la_LDFLAGS = $(PLUGIN_LDFLAGS) write_http_la_LIBADD = libformat_json.la $(BUILD_WITH_LIBCURL_LIBS) endif @@ -1756,8 +1795,8 @@ endif if BUILD_PLUGIN_WRITE_REDIS pkglib_LTLIBRARIES += write_redis.la write_redis_la_SOURCES = src/write_redis.c -write_redis_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBHIREDIS_LDFLAGS) write_redis_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBHIREDIS_CPPFLAGS) +write_redis_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBHIREDIS_LDFLAGS) write_redis_la_LIBADD = -lhiredis endif @@ -1767,8 +1806,8 @@ write_riemann_la_SOURCES = \ src/write_riemann.c \ src/write_riemann_threshold.c \ src/write_riemann_threshold.h -write_riemann_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBRIEMANN_CLIENT_LIBS) write_riemann_la_CFLAGS = $(AM_CFLAGS) $(LIBRIEMANN_CLIENT_CFLAGS) +write_riemann_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBRIEMANN_CLIENT_LIBS) endif if BUILD_PLUGIN_WRITE_SENSU