tests: Move libtestcommon to utils

[babeltrace.git] / tests / lib / Makefile.am

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index e4930d8802709d5b4b98ca064261a11a86164ca2..16616ccfe4519ec59c4d473fa5ccf3a10ca3b446 100644 (file)
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -2,28 +2,25 @@ SUBDIRS =
 
 AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 
-LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
+COMMON_TEST_LDADD = \
+       $(top_builddir)/tests/utils/tap/libtap.la \
+       $(top_builddir)/tests/utils/libtestcommon.la
 
-dist_check_SCRIPTS = ctf-writer/test_auto_populate.py
+test_bitfield_LDADD = $(COMMON_TEST_LDADD)
 
-libtestcommon_la_SOURCES = common.c common.h
-noinst_LTLIBRARIES = libtestcommon.la
+test_ctf_writer_LDADD = \
+       $(COMMON_TEST_LDADD) \
+       $(top_builddir)/src/ctf-writer/libbabeltrace2-ctf-writer.la
 
-# -Wl,--no-as-needed is needed for recent gold linker who seems to think
-# it knows better and considers libraries with constructors having
-# side-effects as dead code.
-COMMON_TEST_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la \
-       $(top_builddir)/lib/libbabeltrace2.la
+test_bt_values_LDADD = $(COMMON_TEST_LDADD) \
+       $(top_builddir)/src/lib/libbabeltrace2.la
 
-test_bitfield_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la
+test_trace_ir_ref_LDADD = $(COMMON_TEST_LDADD) \
+       $(top_builddir)/src/lib/libbabeltrace2.la \
+       $(top_builddir)/src/ctf-writer/libbabeltrace2-ctf-writer.la
 
-test_ctf_writer_LDADD = $(COMMON_TEST_LDADD)
-
-test_bt_values_LDADD = $(COMMON_TEST_LDADD)
-
-test_trace_ir_ref_LDADD = $(COMMON_TEST_LDADD)
-
-test_graph_topo_LDADD = $(COMMON_TEST_LDADD)
+test_graph_topo_LDADD = $(COMMON_TEST_LDADD) \
+       $(top_builddir)/src/lib/libbabeltrace2.la
 
 noinst_PROGRAMS = test_bitfield test_ctf_writer test_bt_values \
        test_trace_ir_ref test_graph_topo
@@ -36,7 +33,8 @@ test_graph_topo_SOURCES = test_graph_topo.c
 
 if !ENABLE_BUILT_IN_PLUGINS
 noinst_PROGRAMS += test_plugin
-test_plugin_LDADD = $(COMMON_TEST_LDADD)
+test_plugin_LDADD = $(COMMON_TEST_LDADD) \
+       $(top_builddir)/src/lib/libbabeltrace2.la
 test_plugin_SOURCES = test_plugin.c
 SUBDIRS += test-plugin-plugins
 endif