X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2FMakefile.am;h=510bc51d3a33963d0e008fcdb5e749e9ba5a47f1;hb=83ab55b888ce8d3081e68dc067998fc71eeff28e;hp=e4930d8802709d5b4b98ca064261a11a86164ca2;hpb=40392cf153f947f694d16de043bc8c6fa952a0a9;p=babeltrace.git

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index e4930d88..510bc51d 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -2,41 +2,56 @@ 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
+
+test_bt_values_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.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_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
+
+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
+
+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
+
+noinst_PROGRAMS = \
+	test_bt_values \
+	test_bt_uuid \
+	test_trace_ir_ref \
+	test_graph_topo \
+	test_simple_sink
 
-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
-
-test_bitfield_LDADD = $(LIBTAP) $(builddir)/libtestcommon.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)
-
-noinst_PROGRAMS = test_bitfield test_ctf_writer test_bt_values \
-	test_trace_ir_ref test_graph_topo
-
-test_bitfield_SOURCES = test_bitfield.c
-test_ctf_writer_SOURCES = test_ctf_writer.c
 test_bt_values_SOURCES = test_bt_values.c
+test_simple_sink_SOURCES = test_simple_sink.c
+test_bt_uuid_SOURCES = test_bt_uuid.c
 test_trace_ir_ref_SOURCES = test_trace_ir_ref.c
 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_SOURCES = test_plugin.c
+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
+plugin_SOURCES = plugin.c
 SUBDIRS += test-plugin-plugins
 endif
+
+dist_check_SCRIPTS = test_plugin