projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.5'
[collectd.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
24f06fd
..
35747e7
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,4
+1,4
@@
-SUBDIRS =
+SUBDIRS =
libcollectdclient
if BUILD_WITH_OWN_LIBIPTC
SUBDIRS += libiptc
endif
if BUILD_WITH_OWN_LIBIPTC
SUBDIRS += libiptc
endif
@@
-30,6
+30,7
@@
collectd_SOURCES = collectd.c collectd.h \
common.c common.h \
configfile.c configfile.h \
filter_chain.c filter_chain.h \
common.c common.h \
configfile.c configfile.h \
filter_chain.c filter_chain.h \
+ meta_data.c meta_data.h \
plugin.c plugin.h \
utils_avltree.c utils_avltree.h \
utils_cache.c utils_cache.h \
plugin.c plugin.h \
utils_avltree.c utils_avltree.h \
utils_cache.c utils_cache.h \
@@
-92,6
+93,8
@@
collectd_nagios_LDFLAGS =
if BUILD_WITH_LIBSOCKET
collectd_nagios_LDFLAGS += -lsocket
endif
if BUILD_WITH_LIBSOCKET
collectd_nagios_LDFLAGS += -lsocket
endif
+collectd_nagios_LDADD = libcollectdclient/libcollectdclient.la
+collectd_nagios_DEPENDENCIES = libcollectdclient/libcollectdclient.la
pkglib_LTLIBRARIES =
pkglib_LTLIBRARIES =
@@
-400,6
+403,14
@@
collectd_LDADD += "-dlopen" match_regex.la
collectd_DEPENDENCIES += match_regex.la
endif
collectd_DEPENDENCIES += match_regex.la
endif
+if BUILD_PLUGIN_MATCH_VALUE
+pkglib_LTLIBRARIES += match_value.la
+match_value_la_SOURCES = match_value.c
+match_value_la_LDFLAGS = -module -avoid-version
+collectd_LDADD += "-dlopen" match_value.la
+collectd_DEPENDENCIES += match_value.la
+endif
+
if BUILD_PLUGIN_MBMON
pkglib_LTLIBRARIES += mbmon.la
mbmon_la_SOURCES = mbmon.c
if BUILD_PLUGIN_MBMON
pkglib_LTLIBRARIES += mbmon.la
mbmon_la_SOURCES = mbmon.c
@@
-731,6
+742,14
@@
collectd_LDADD += "-dlopen" tape.la
collectd_DEPENDENCIES += tape.la
endif
collectd_DEPENDENCIES += tape.la
endif
+if BUILD_PLUGIN_TARGET_SET
+pkglib_LTLIBRARIES += target_set.la
+target_set_la_SOURCES = target_set.c
+target_set_la_LDFLAGS = -module -avoid-version
+collectd_LDADD += "-dlopen" target_set.la
+collectd_DEPENDENCIES += target_set.la
+endif
+
if BUILD_PLUGIN_TCPCONNS
pkglib_LTLIBRARIES += tcpconns.la
tcpconns_la_SOURCES = tcpconns.c
if BUILD_PLUGIN_TCPCONNS
pkglib_LTLIBRARIES += tcpconns.la
tcpconns_la_SOURCES = tcpconns.c
@@
-848,7
+867,7
@@
EXTRA_DIST += collectd-email.pod collectd-exec.pod collectd-nagios.pod \
.pod.1:
pod2man --release=$(VERSION) --center=$(PACKAGE) $< \
>.pod2man.tmp 2>/dev/null && mv -f .pod2man.tmp $@ || true
.pod.1:
pod2man --release=$(VERSION) --center=$(PACKAGE) $< \
>.pod2man.tmp 2>/dev/null && mv -f .pod2man.tmp $@ || true
- if grep '\<POD ERRORS\>' $@ >/dev/null 2>&1; \
+
@
if grep '\<POD ERRORS\>' $@ >/dev/null 2>&1; \
then \
echo "$@ has some POD errors!"; false; \
fi
then \
echo "$@ has some POD errors!"; false; \
fi
@@
-856,7
+875,7
@@
EXTRA_DIST += collectd-email.pod collectd-exec.pod collectd-nagios.pod \
.pod.5:
pod2man --section=5 --release=$(VERSION) --center=$(PACKAGE) $< \
>.pod2man.tmp 2>/dev/null && mv -f .pod2man.tmp $@ || true
.pod.5:
pod2man --section=5 --release=$(VERSION) --center=$(PACKAGE) $< \
>.pod2man.tmp 2>/dev/null && mv -f .pod2man.tmp $@ || true
- if grep '\<POD ERRORS\>' $@ >/dev/null 2>&1; \
+
@
if grep '\<POD ERRORS\>' $@ >/dev/null 2>&1; \
then \
echo "$@ has some POD errors!"; false; \
fi
then \
echo "$@ has some POD errors!"; false; \
fi