X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2FMakefile.am;h=9cb75b00039ca013824433d2346beca064e8475b;hb=67d2ce028c96b6a3b3614b393d8928663bce4490;hp=e4930d8802709d5b4b98ca064261a11a86164ca2;hpb=a12f3d624772f543137e60252101871cd6017a06;p=babeltrace.git

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index e4930d88..9cb75b00 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -4,26 +4,26 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 
 LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
 
-dist_check_SCRIPTS = ctf-writer/test_auto_populate.py
-
 libtestcommon_la_SOURCES = common.c common.h
 noinst_LTLIBRARIES = libtestcommon.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
+COMMON_TEST_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la
 
 test_bitfield_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la
 
-test_ctf_writer_LDADD = $(COMMON_TEST_LDADD)
+test_ctf_writer_LDADD = \
+	$(COMMON_TEST_LDADD) \
+	$(top_builddir)/ctf-writer/libbabeltrace2-ctf-writer.la
 
-test_bt_values_LDADD = $(COMMON_TEST_LDADD)
+test_bt_values_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/lib/libbabeltrace2.la
 
-test_trace_ir_ref_LDADD = $(COMMON_TEST_LDADD)
+test_trace_ir_ref_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/lib/libbabeltrace2.la \
+	$(top_builddir)/ctf-writer/libbabeltrace2-ctf-writer.la
 
-test_graph_topo_LDADD = $(COMMON_TEST_LDADD)
+test_graph_topo_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/lib/libbabeltrace2.la
 
 noinst_PROGRAMS = test_bitfield test_ctf_writer test_bt_values \
 	test_trace_ir_ref test_graph_topo
@@ -36,7 +36,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)/lib/libbabeltrace2.la
 test_plugin_SOURCES = test_plugin.c
 SUBDIRS += test-plugin-plugins
 endif