Code

collectd_tg: simplify logic a bit
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 3 Jun 2016 15:04:06 +0000 (17:04 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 3 Jun 2016 15:04:06 +0000 (17:04 +0200)
We always link collectdctl with libcollectdclient/libcollectdclient.la.
Make this more obvious.

src/Makefile.am

index db8b44ed7cd7366a5090dda097a56c90737a4acf..7f3dae466a7e85ba25d8a3d3f6ddf648d8d81681 100644 (file)
@@ -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 =