X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2FMakefile.am;h=f66b73ece58d84e00cd86e70e207c5c280e4c2ea;hb=7de0939d96fe680ec5cd14e46c72f23653fd1d0a;hp=1d6a1925a6fdf7cc9f87c6b2a6b43d0566f37dcd;hpb=4cdc32cf066f85bce93f1b25167bd258a18367af;p=babeltrace.git

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 1d6a1925..f66b73ec 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -1,20 +1,43 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils
+SUBDIRS = trace-ir ctf-writer
 
-noinst_LIBRARIES = libtestcommon.a
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 
 LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
 
-libtestcommon_a_SOURCES = common.c common.h
+libtestcommon_la_SOURCES = common.c common.h
+noinst_LTLIBRARIES = libtestcommon.la
 
-test_seek_LDADD = $(LIBTAP) libtestcommon.a \
-	$(top_builddir)/lib/libbabeltrace.la \
-	$(top_builddir)/formats/ctf/libbabeltrace-ctf.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/libbabeltrace.la
 
-test_bitfield_LDADD = $(LIBTAP) libtestcommon.a
+test_bitfield_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la
 
-noinst_PROGRAMS = test_seek test_bitfield
+test_ctf_writer_LDADD = $(COMMON_TEST_LDADD)
 
-test_seek_SOURCES = test_seek.c
-test_bitfield_SOURCES = test_bitfield.c
+test_bt_values_LDADD = $(COMMON_TEST_LDADD)
+
+test_trace_ir_ref_LDADD = $(COMMON_TEST_LDADD)
+
+test_graph_topo_LDADD = $(COMMON_TEST_LDADD)
 
-dist_noinst_SCRIPTS = test_seek_big_trace test_seek_empty_packet
+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_trace_ir_ref_SOURCES = test_trace_ir_ref.c
+test_graph_topo_SOURCES = test_graph_topo.c
+
+check_SCRIPTS = test_ctf_writer_complete
+
+if !ENABLE_BUILT_IN_PLUGINS
+noinst_PROGRAMS += test_plugin
+test_plugin_LDADD = $(COMMON_TEST_LDADD)
+test_plugin_SOURCES = test_plugin.c
+check_SCRIPTS += test_plugin_complete
+SUBDIRS += test-plugin-plugins
+endif