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

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index a7de0a94..9cb75b00 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -1,23 +1,43 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils
+SUBDIRS =
 
-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
+COMMON_TEST_LDADD = $(LIBTAP) $(builddir)/libtestcommon.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) \
+	$(top_builddir)/ctf-writer/libbabeltrace2-ctf-writer.la
 
-test_seek_SOURCES = test_seek.c
-test_bitfield_SOURCES = test_bitfield.c
+test_bt_values_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/lib/libbabeltrace2.la
+
+test_trace_ir_ref_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/lib/libbabeltrace2.la \
+	$(top_builddir)/ctf-writer/libbabeltrace2-ctf-writer.la
 
-EXTRA_DIST = runall.sh
+test_graph_topo_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/lib/libbabeltrace2.la
 
-check-am:
-	./runall.sh
+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
+
+if !ENABLE_BUILT_IN_PLUGINS
+noinst_PROGRAMS += test_plugin
+test_plugin_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/lib/libbabeltrace2.la
+test_plugin_SOURCES = test_plugin.c
+SUBDIRS += test-plugin-plugins
+endif