From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 3 Jun 2016 14:52:47 +0000 (+0200)
Subject: src/Makefile.am: simplify logic a bit
X-Git-Tag: collectd-5.6.0~287
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=03b30b9b250aa2c4c023881c15fadfce8be50619;p=collectd.git

src/Makefile.am: simplify logic a bit

We always link collectd_nagios with libcollectdclient/libcollectdclient.la.
Make this more obvious.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 45cf5151..783dda29 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,7 +56,8 @@ collectdmon_SOURCES = collectdmon.c
 
 collectd_nagios_SOURCES = collectd-nagios.c
 collectd_nagios_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/libcollectdclient/collectd -I$(top_builddir)/src/libcollectdclient/collectd
-collectd_nagios_LDADD =
+collectd_nagios_LDADD = libcollectdclient/libcollectdclient.la
+collectd_nagios_DEPENDENCIES = libcollectdclient/libcollectdclient.la
 if BUILD_WITH_LIBSOCKET
 collectd_nagios_LDADD += -lsocket
 endif
@@ -64,9 +65,6 @@ if BUILD_AIX
 collectd_nagios_LDADD += -lm
 endif
 
-collectd_nagios_LDADD += libcollectdclient/libcollectdclient.la
-collectd_nagios_DEPENDENCIES = libcollectdclient/libcollectdclient.la
-
 
 collectdctl_SOURCES = collectdctl.c
 collectdctl_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/libcollectdclient/collectd -I$(top_builddir)/src/libcollectdclient/collectd