projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auto-Merge pull request #3203 from dago/netsnmpagent
[collectd.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
8b37b49
..
9b9698f
100644
(file)
--- 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_time \
test_utils_vl_lookup \
test_libcollectd_network_parse \
- test_utils_config_cores \
- test_utils_proc_pids
+ test_utils_config_cores
TESTS = $(check_PROGRAMS)
TESTS = $(check_PROGRAMS)
@@
-277,7
+276,7
@@
collectd_LDFLAGS += -ldl -Wl,--out-implib,libcollectd.a
else
collectd_SOURCES += src/daemon/cmd.c
endif
else
collectd_SOURCES += src/daemon/cmd.c
endif
-
+
if BUILD_FEATURE_DAEMON
collectd_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
endif
if BUILD_FEATURE_DAEMON
collectd_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
endif
@@
-1089,6
+1088,7
@@
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
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
TESTS += test_plugin_intel_rdt
endif
@@
-2078,6
+2078,12
@@
write_stackdriver_la_LIBADD = libformat_stackdriver.la libgce.la liboauth.la \
$(BUILD_WITH_LIBCURL_LIBS)
endif
$(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
if BUILD_PLUGIN_WRITE_TSDB
pkglib_LTLIBRARIES += write_tsdb.la
write_tsdb_la_SOURCES = src/write_tsdb.c