From d1fc88e372d331f671422136143e4ab52ca9ef73 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Tue, 23 Jun 2015 14:26:55 +0200 Subject: [PATCH] src/Makefile.am: Move tests towards the libraries tested. --- src/Makefile.am | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 5868af59..65bb91a6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,13 +23,25 @@ AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"' AUTOMAKE_OPTIONS = subdir-objects -noinst_LTLIBRARIES = libmount.la liblookup.la +noinst_LTLIBRARIES = +check_PROGRAMS = +TESTS = +noinst_LTLIBRARIES += liblookup.la +liblookup_la_SOURCES = utils_vl_lookup.c utils_vl_lookup.h +liblookup_la_LIBADD = daemon/libavltree.la +check_PROGRAMS += test_utils_vl_lookup +TESTS += test_utils_vl_lookup +test_utils_vl_lookup_SOURCES = utils_vl_lookup_test.c testing.h +test_utils_vl_lookup_LDADD = liblookup.la daemon/libcommon.la daemon/libplugin_mock.la + +noinst_LTLIBRARIES += libmount.la libmount_la_SOURCES = utils_mount.c utils_mount.h -libmount_la_LIBADD = daemon/libcommon.la +check_PROGRAMS += test_utils_mount +TESTS += test_utils_mount +test_utils_mount_SOURCES = utils_mount_test.c testing.h +test_utils_mount_LDADD = libmount.la daemon/libcommon.la daemon/libplugin_mock.la -liblookup_la_SOURCES = utils_vl_lookup.c utils_vl_lookup.h -liblookup_la_LIBADD = daemon/libavltree.la daemon/libcommon.la sbin_PROGRAMS = collectdmon bin_PROGRAMS = collectd-nagios collectdctl collectd-tg @@ -1387,12 +1399,4 @@ uninstall-hook: rm -f $(DESTDIR)$(sysconfdir)/collectd.conf rm -f $(DESTDIR)$(pkgdatadir)/postgresql_default.conf; -check_PROGRAMS = test_utils_mount test_utils_vl_lookup - -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 testing.h -test_utils_vl_lookup_LDADD = liblookup.la daemon/libplugin_mock.la -TESTS = test_utils_mount test_utils_vl_lookup -- 2.11.0