X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile.am;h=805733e64397f1747ea22704808cfc7330574550;hb=446138394bb95c49d0e05ea440fbf63aefe84bab;hp=17534ec69aa82953a4aeaa9647fd555e4e42f8f3;hpb=3e891e50eedcb53ed42b140b942947856ca9c8a0;p=collectd.git diff --git a/Makefile.am b/Makefile.am index 17534ec6..805733e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -486,13 +486,13 @@ libcollectdclient_la_LIBADD += $(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 +508,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 +520,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 +553,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 +584,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 +609,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 +675,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 +698,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 @@ -768,7 +768,7 @@ 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 +817,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 +870,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 +968,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 +1065,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 +1112,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 +1150,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 +1181,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 @@ -1284,8 +1284,8 @@ 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 @@ -1299,11 +1299,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 @@ -1340,7 +1339,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 @@ -1383,8 +1382,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 @@ -1402,8 +1401,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 @@ -1413,8 +1412,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 @@ -1617,7 +1616,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 @@ -1655,8 +1654,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 @@ -1664,7 +1663,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) @@ -1674,10 +1673,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 @@ -1713,8 +1712,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 @@ -1759,8 +1758,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 @@ -1770,8 +1769,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