X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2Flib%2FMakefile.am;h=b2b34642e07fea6c54d8beced4bf5faa73f9a581;hp=e9e264bbbb17c5756f1243f33f42b8fc0cc691d9;hb=44c440bc5fe8219cc17d1b786d91fd83c4c9860a;hpb=0cf14365731316b65a24742928e8a72100ebe907

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index e9e264bb..b2b34642 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -1,18 +1,46 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+SUBDIRS = ctf-ir ctf-writer
 
-noinst_LIBRARIES = libtestcommon.a
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 
-libtestcommon_a_SOURCES = tap.c tap.h common.c common.h
+LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
 
-test_seeks_LDADD = libtestcommon.a \
-	$(top_builddir)/lib/libbabeltrace.la \
-	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la
+libtestcommon_la_SOURCES = common.c common.h
+noinst_LTLIBRARIES = libtestcommon.la
 
-noinst_PROGRAMS = test-seeks
+# -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_seeks_SOURCES = test-seeks.c
+test_bitfield_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la
 
-EXTRA_DIST = README.tap runall.sh
+test_ctf_writer_LDADD = $(COMMON_TEST_LDADD)
 
-check-am:
-	./runall.sh
+test_bt_values_LDADD = $(COMMON_TEST_LDADD)
+
+test_ctf_ir_ref_LDADD = $(COMMON_TEST_LDADD)
+
+test_graph_topo_LDADD = $(COMMON_TEST_LDADD)
+
+test_bt_notification_iterator_LDADD = $(COMMON_TEST_LDADD)
+
+noinst_PROGRAMS = test_bitfield test_ctf_writer test_bt_values \
+	test_ctf_ir_ref test_graph_topo test_bt_notification_iterator
+
+test_bitfield_SOURCES = test_bitfield.c
+test_ctf_writer_SOURCES = test_ctf_writer.c
+test_bt_values_SOURCES = test_bt_values.c
+test_ctf_ir_ref_SOURCES = test_ctf_ir_ref.c
+test_graph_topo_SOURCES = test_graph_topo.c
+test_bt_notification_iterator_SOURCES = test_bt_notification_iterator.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