summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 35ad86c)
raw | patch | inline | side by side (parent: 35ad86c)
author | Hakon-Dugstad.Johnsen@telenor.com <Hakon-Dugstad.Johnsen@telenor.com> | |
Thu, 5 Aug 2010 14:40:18 +0000 (16:40 +0200) | ||
committer | Florian Forster <octo@huhu.verplant.org> | |
Fri, 6 Aug 2010 06:49:01 +0000 (08:49 +0200) |
As I am no automake expert, I basically copied
the lines for collectd-nagios and changed them
to collectd-flush. It works, but maybe there could
be better ways to do it. I don't know. :)
As I said in the previous mail:
If this message is not properly encoded as utf-8, something wrong must have
happened with my mailer. If that's the case, I'm sorry. The only non-ascii character
in the patch is the second character of my name, which is an å.
Signed-off-by: HÃ¥kon J Dugstad Johnsen <hakon-dugstad.johnsen@telenor.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
the lines for collectd-nagios and changed them
to collectd-flush. It works, but maybe there could
be better ways to do it. I don't know. :)
As I said in the previous mail:
If this message is not properly encoded as utf-8, something wrong must have
happened with my mailer. If that's the case, I'm sorry. The only non-ascii character
in the patch is the second character of my name, which is an å.
Signed-off-by: HÃ¥kon J Dugstad Johnsen <hakon-dugstad.johnsen@telenor.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
src/Makefile.am | patch | blob | history |
diff --git a/src/Makefile.am b/src/Makefile.am
index 00d0e20e0a9f9eec5eb51954627e529a4fb8913a..9d45920ac19ea24954b320b2d1053e340f803d7e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"'
sbin_PROGRAMS = collectd collectdmon
-bin_PROGRAMS = collectd-nagios
+bin_PROGRAMS = collectd-nagios collectd-flush
collectd_SOURCES = collectd.c collectd.h \
common.c common.h \
collectd_nagios_LDADD += libcollectdclient/libcollectdclient.la
collectd_nagios_DEPENDENCIES = libcollectdclient/libcollectdclient.la
+
+collectd_flush_SOURCES = collectd-flush.c
+collectd_flush_LDADD =
+if BUILD_WITH_LIBSOCKET
+collectd_flush_LDADD += -lsocket
+endif
+if BUILD_AIX
+collectd_flush_LDADD += -lm
+endif
+collectd_flush_LDADD += libcollectdclient/libcollectdclient.la
+collectd_flush_DEPENDENCIES = libcollectdclient/libcollectdclient.la
+
+
pkglib_LTLIBRARIES =
BUILT_SOURCES =