X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile.am;h=323e17c5293bf6d8187e91ec88bf2e7cd21bef1f;hb=76fb10bf790e35dd6caca13c4bb5d0f86c517370;hp=90a327394c6a02133df5288a5b8db9e00c17168f;hpb=99d0d374adc5c628d937d750caa04c68e87b3eca;p=collectd.git

diff --git a/Makefile.am b/Makefile.am
index 90a32739..323e17c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -585,7 +585,7 @@ if BUILD_PLUGIN_BIND
 pkglib_LTLIBRARIES += bind.la
 bind_la_SOURCES = src/bind.c
 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
@@ -609,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
@@ -767,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
@@ -816,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
@@ -1174,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
@@ -1283,7 +1284,7 @@ ovs_events_la_SOURCES = \
 	src/ovs_events.c \
 	src/utils_ovs.c \
 	src/utils_ovs.h
-ovs_events_la_CPPFLAGS = $(BUILD_WITH_LIBYAJL_CPPFLAGS)
+ovs_events_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
 ovs_events_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
 ovs_events_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS)
 endif
@@ -1298,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
 
@@ -1339,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
 
@@ -1663,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)
 
@@ -1673,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