X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile.am;h=9b9698f349a4a859da6f38ca01412b81d7bddbe4;hb=d785ef4808a3d26a366f1035367d66564f04c235;hp=b4195c1353674189750e0a446aad4b594b9d6131;hpb=df49cf6aac930f56813af82d1ea8669783349a21;p=collectd.git

diff --git a/Makefile.am b/Makefile.am
index b4195c13..9b9698f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -159,8 +159,7 @@ check_PROGRAMS = \
 	test_utils_time \
 	test_utils_vl_lookup \
 	test_libcollectd_network_parse \
-	test_utils_config_cores \
-	test_utils_proc_pids
+	test_utils_config_cores
 
 
 TESTS = $(check_PROGRAMS)
@@ -277,7 +276,7 @@ collectd_LDFLAGS += -ldl -Wl,--out-implib,libcollectd.a
 else
 collectd_SOURCES += src/daemon/cmd.c
 endif
-	
+
 if BUILD_FEATURE_DAEMON
 collectd_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
 endif
@@ -378,7 +377,7 @@ test_utils_config_cores_SOURCES = \
 test_utils_config_cores_LDADD = libplugin_mock.la
 
 test_utils_proc_pids_SOURCES = \
-	src/utils_proc_pids_test.c \
+	src/utils/proc_pids/proc_pids_test.c \
 	src/testing.h
 test_utils_proc_pids_LDADD = libplugin_mock.la
 
@@ -1071,8 +1070,8 @@ if BUILD_PLUGIN_INTEL_RDT
 pkglib_LTLIBRARIES += intel_rdt.la
 intel_rdt_la_SOURCES = \
 	src/intel_rdt.c \
-	src/utils_proc_pids.c \
-	src/utils_proc_pids.h \
+	src/utils/proc_pids/proc_pids.c \
+	src/utils/proc_pids/proc_pids.h \
 	src/utils/config_cores/config_cores.h \
 	src/utils/config_cores/config_cores.c
 intel_rdt_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBPQOS_CPPFLAGS)
@@ -1082,13 +1081,14 @@ intel_rdt_la_LIBADD = $(BUILD_WITH_LIBPQOS_LIBS)
 test_plugin_intel_rdt_SOURCES = \
 	src/intel_rdt_test.c \
 	src/utils/config_cores/config_cores.c \
-	src/utils_proc_pids.c \
+	src/utils/proc_pids/proc_pids.c \
 	src/daemon/configfile.c \
 	src/daemon/types_list.c
 test_plugin_intel_rdt_CPPFLAGS = $(AM_CPPFLAGS)
 test_plugin_intel_rdt_LDFLAGS = $(PLUGIN_LDFLAGS)
 test_plugin_intel_rdt_LDADD = liboconfig.la libplugin_mock.la
 check_PROGRAMS += test_plugin_intel_rdt
+TESTS += test_utils_proc_pids
 TESTS += test_plugin_intel_rdt
 endif
 
@@ -1959,12 +1959,13 @@ virt_la_CFLAGS = $(AM_CFLAGS) \
 virt_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 virt_la_LIBADD = libignorelist.la $(BUILD_WITH_LIBVIRT_LIBS) $(BUILD_WITH_LIBXML2_LIBS)
 
-test_plugin_virt_SOURCES = src/virt_test.c
+test_plugin_virt_SOURCES = src/virt_test.c src/daemon/configfile.c \
+	src/daemon/types_list.c
 test_plugin_virt_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(BUILD_WITH_LIBVIRT_CPPFLAGS) $(BUILD_WITH_LIBXML2_CFLAGS)
 test_plugin_virt_LDFLAGS = $(PLUGIN_LDFLAGS) \
 	$(BUILD_WITH_LIBVIRT_LDFLAGS) $(BUILD_WITH_LIBXML2_LDFLAGS)
-test_plugin_virt_LDADD = libplugin_mock.la \
+test_plugin_virt_LDADD = liboconfig.la libplugin_mock.la \
 	$(BUILD_WITH_LIBVIRT_LIBS) $(BUILD_WITH_LIBXML2_LIBS)
 check_PROGRAMS += test_plugin_virt
 TESTS += test_plugin_virt
@@ -2077,6 +2078,12 @@ write_stackdriver_la_LIBADD = libformat_stackdriver.la libgce.la liboauth.la \
                      $(BUILD_WITH_LIBCURL_LIBS)
 endif
 
+if BUILD_PLUGIN_WRITE_SYSLOG
+pkglib_LTLIBRARIES += write_syslog.la
+write_syslog_la_SOURCES = src/write_syslog.c
+write_syslog_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+endif
+
 if BUILD_PLUGIN_WRITE_TSDB
 pkglib_LTLIBRARIES += write_tsdb.la
 write_tsdb_la_SOURCES = src/write_tsdb.c