From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 3 Jun 2016 15:04:06 +0000 (+0200)
Subject: collectd_tg: simplify logic a bit
X-Git-Tag: collectd-5.6.0~283
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=a4a771a4d7e9d030cd3ba2de1823afda746b5e9b;p=collectd.git

collectd_tg: simplify logic a bit

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

diff --git a/src/Makefile.am b/src/Makefile.am
index db8b44ed..7f3dae46 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,7 +79,10 @@ endif
 collectd_tg_SOURCES = collectd-tg.c
 collectd_tg_CPPFLAGS = $(AM_CPPFLAGS) \
 		       -I$(top_srcdir)/src/libcollectdclient/collectd -I$(top_builddir)/src/libcollectdclient/collectd
-collectd_tg_LDADD = daemon/libheap.la
+collectd_tg_LDADD = \
+	daemon/libheap.la \
+	libcollectdclient/libcollectdclient.la
+collectd_tg_DEPENDENCIES = libcollectdclient/libcollectdclient.la
 if BUILD_WITH_LIBSOCKET
 collectd_tg_LDADD += -lsocket
 endif
@@ -92,8 +95,6 @@ endif
 if BUILD_WITH_LIBPTHREAD
 collectd_tg_LDADD += $(PTHREAD_LIBS)
 endif
-collectd_tg_LDADD += libcollectdclient/libcollectdclient.la
-collectd_tg_DEPENDENCIES = libcollectdclient/libcollectdclient.la
 
 
 pkglib_LTLIBRARIES =