From: Florian Forster <octo@collectd.org>
Date: Tue, 26 May 2015 19:43:10 +0000 (+0200)
Subject: Build system: Fix linking with libheap.la and depend on testing.h.
X-Git-Tag: collectd-5.5.0~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a041631739087cbd002293652ee23bed9ce25478;p=collectd.git

Build system: Fix linking with libheap.la and depend on testing.h.

collectd-tg tried to link with libheap.a (instead of ….la), which
doesn't exist. testing.h was not mentioned by any target, leading to it
being missing form the tarballs.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 37d9216f..9839c03a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,7 +65,7 @@ collectdctl_DEPENDENCIES = libcollectdclient/libcollectdclient.la
 
 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.a
+collectd_tg_LDADD = daemon/libheap.la
 if BUILD_WITH_LIBSOCKET
 collectd_tg_LDADD += -lsocket
 endif
@@ -1382,10 +1382,10 @@ uninstall-hook:
 
 check_PROGRAMS = test_utils_mount test_utils_vl_lookup
 
-test_utils_mount_SOURCES = utils_mount_test.c
+test_utils_mount_SOURCES = utils_mount_test.c testing.h
 test_utils_mount_LDADD = libmount.la daemon/libplugin_mock.la
 
-test_utils_vl_lookup_SOURCES = utils_vl_lookup_test.c
+test_utils_vl_lookup_SOURCES = utils_vl_lookup_test.c testing.h
 test_utils_vl_lookup_LDADD = liblookup.la daemon/libplugin_mock.la
 
 TESTS = test_utils_mount test_utils_vl_lookup
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 06bc150f..7f826e34 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -94,11 +94,11 @@ endif
 check_PROGRAMS = test_common test_utils_avltree test_utils_heap
 TESTS = test_common test_utils_avltree test_utils_heap
 
-test_common_SOURCES = common_test.c
+test_common_SOURCES = common_test.c ../testing.h
 test_common_LDADD = libcommon.la libplugin_mock.la
 
-test_utils_avltree_SOURCES = utils_avltree_test.c
+test_utils_avltree_SOURCES = utils_avltree_test.c ../testing.h
 test_utils_avltree_LDADD = libavltree.la
 
-test_utils_heap_SOURCES = utils_heap_test.c
+test_utils_heap_SOURCES = utils_heap_test.c ../testing.h
 test_utils_heap_LDADD = libheap.la