X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2FMakefile.am;h=593999c8aeb2967316c612f5fdc6412adcf51469;hb=d31480098fc794d7de1135a649c4a05b0b7fa07e;hp=13df71575e94d27251efba095c912eb622b1efd4;hpb=33ba099be73c8de32a8fab15fdd75ed320219c17;p=babeltrace.git

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 13df7157..593999c8 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -1,74 +1,47 @@
-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
+COMMON_TEST_LDADD = \
+	$(top_builddir)/tests/utils/tap/libtap.la \
+	$(top_builddir)/tests/utils/libtestcommon.la \
+	$(top_builddir)/src/common/libbabeltrace2-common.la \
+	$(top_builddir)/src/logging/libbabeltrace2-logging.la
 
-libtestcommon_a_SOURCES = common.c common.h
+test_bt_values_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.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.
-test_seek_LDFLAGS = $(LD_NO_AS_NEEDED)
-test_seek_LDADD = $(LIBTAP) libtestcommon.a \
-	$(top_builddir)/lib/libbabeltrace.la \
-	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la
+test_bt_uuid_LDADD = $(COMMON_TEST_LDADD)
 
-test_bitfield_LDADD = $(LIBTAP) libtestcommon.a
+test_trace_ir_ref_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.la \
+	$(top_builddir)/src/ctf-writer/libbabeltrace2-ctf-writer.la
 
-test_ctf_writer_LDADD = $(LIBTAP) \
-	$(top_builddir)/lib/libbabeltrace.la \
-	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la
+test_graph_topo_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.la
 
-test_bt_values_LDADD = $(LIBTAP) \
-	$(top_builddir)/lib/libbabeltrace.la
+test_simple_sink_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.la
 
-test_ctf_ir_ref_LDADD = $(LIBTAP) \
-	$(top_builddir)/lib/libbabeltrace.la \
-	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la
+noinst_PROGRAMS = \
+	test_bt_values \
+	test_bt_uuid \
+	test_trace_ir_ref \
+	test_graph_topo \
+	test_simple_sink
 
-test_bt_ctf_field_type_validation_LDADD = $(LIBTAP) \
-	$(top_builddir)/lib/libbabeltrace.la \
-	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la
-
-noinst_PROGRAMS = test_seek test_bitfield test_ctf_writer test_bt_values \
-	test_ctf_ir_ref test_bt_ctf_field_type_validation
-
-test_seek_SOURCES = test_seek.c
-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_bt_ctf_field_type_validation_SOURCES = test_bt_ctf_field_type_validation.c
-
-SCRIPT_LIST = test_seek_big_trace \
-	test_seek_empty_packet \
-	test_ctf_writer_complete
-EXTRA_DIST = test_seek_big_trace.in test_seek_empty_packet.in
-
-if ENABLE_DEBUGINFO
-test_dwarf_LDFLAGS = -static
-test_dwarf_LDADD = $(LIBTAP) \
-	$(top_builddir)/lib/libbabeltrace.la \
-	$(top_builddir)/lib/libdebuginfo.la
-test_dwarf_SOURCES = test_dwarf.c
-
-noinst_PROGRAMS += test_dwarf
-SCRIPT_LIST += test_dwarf_complete
+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 += plugin
+plugin_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.la
+plugin_SOURCES = plugin.c
+SUBDIRS += test-plugin-plugins
 endif
 
-dist_noinst_SCRIPTS = $(SCRIPT_LIST)
-
-all-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			cp -f $(srcdir)/$$script $(builddir); \
-		done; \
-	fi
-
-clean-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			rm -f $(builddir)/$$script; \
-		done; \
-	fi
+dist_check_SCRIPTS = test_plugin