tests/lib/Makefile.am: Move libbabeltrace2-common and libbabeltrace2-logging to COMMO...

These libraries are necessary to all tests that use BT_ASSERT, which is
the case of pretty much every test.

Change-Id: Ifdc7e21f7540c694533f15f3fd55f46738683464
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2428
Tested-by: jenkins <jenkins@lttng.org>

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 510bc51d3a33963d0e008fcdb5e749e9ba5a47f1..593999c8aeb2967316c612f5fdc6412adcf51469 100644 (file)
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -4,32 +4,24 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 
 COMMON_TEST_LDADD = \
        $(top_builddir)/tests/utils/tap/libtap.la \
-       $(top_builddir)/tests/utils/libtestcommon.la
-
-test_bt_values_LDADD = $(COMMON_TEST_LDADD) \
-       $(top_builddir)/src/lib/libbabeltrace2.la \
+       $(top_builddir)/tests/utils/libtestcommon.la \
        $(top_builddir)/src/common/libbabeltrace2-common.la \
        $(top_builddir)/src/logging/libbabeltrace2-logging.la
 
-test_bt_uuid_LDADD = $(COMMON_TEST_LDADD) \
-       $(top_builddir)/src/common/libbabeltrace2-common.la \
-       $(top_builddir)/src/logging/libbabeltrace2-logging.la
+test_bt_values_LDADD = $(COMMON_TEST_LDADD) \
+       $(top_builddir)/src/lib/libbabeltrace2.la
+
+test_bt_uuid_LDADD = $(COMMON_TEST_LDADD)
 
 test_trace_ir_ref_LDADD = $(COMMON_TEST_LDADD) \
        $(top_builddir)/src/lib/libbabeltrace2.la \
-       $(top_builddir)/src/ctf-writer/libbabeltrace2-ctf-writer.la \
-       $(top_builddir)/src/common/libbabeltrace2-common.la \
-       $(top_builddir)/src/logging/libbabeltrace2-logging.la
+       $(top_builddir)/src/ctf-writer/libbabeltrace2-ctf-writer.la
 
 test_graph_topo_LDADD = $(COMMON_TEST_LDADD) \
-       $(top_builddir)/src/lib/libbabeltrace2.la \
-       $(top_builddir)/src/common/libbabeltrace2-common.la \
-       $(top_builddir)/src/logging/libbabeltrace2-logging.la
+       $(top_builddir)/src/lib/libbabeltrace2.la
 
 test_simple_sink_LDADD = $(COMMON_TEST_LDADD) \
-       $(top_builddir)/src/lib/libbabeltrace2.la \
-       $(top_builddir)/src/common/libbabeltrace2-common.la \
-       $(top_builddir)/src/logging/libbabeltrace2-logging.la
+       $(top_builddir)/src/lib/libbabeltrace2.la
 
 noinst_PROGRAMS = \
        test_bt_values \
@@ -47,9 +39,7 @@ test_graph_topo_SOURCES = test_graph_topo.c
 if !ENABLE_BUILT_IN_PLUGINS
 noinst_PROGRAMS += plugin
 plugin_LDADD = $(COMMON_TEST_LDADD) \
-       $(top_builddir)/src/lib/libbabeltrace2.la \
-       $(top_builddir)/src/common/libbabeltrace2-common.la \
-       $(top_builddir)/src/logging/libbabeltrace2-logging.la
+       $(top_builddir)/src/lib/libbabeltrace2.la
 plugin_SOURCES = plugin.c
 SUBDIRS += test-plugin-plugins
 endif