X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2FMakefile.am;h=efbb6c860deb0a76320af830b0a05a23125aa805;hb=644e036445497ef69ccf946f0700da20a5bae84f;hp=060ff29d4734a09c868ef325c4e810caf8f4a721;hpb=5b876b066f8c4022939c7ba05c7b6e94a585653d;p=babeltrace.git

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 060ff29d..efbb6c86 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -1,75 +1,37 @@
-SUBDIRS = test-plugin-plugins writer .
+SUBDIRS =
 
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils
+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
 
-libtestcommon_la_SOURCES = common.c common.h
-noinst_LTLIBRARIES = libtestcommon.la
+test_bitfield_LDADD = $(COMMON_TEST_LDADD)
 
-# -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_bt_values_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.la
 
-test_bitfield_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la
+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 = $(COMMON_TEST_LDADD)
+test_graph_topo_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.la
 
-test_bt_values_LDADD = $(LIBTAP) \
-	$(top_builddir)/lib/libbabeltrace.la
-
-test_ctf_ir_ref_LDADD = $(COMMON_TEST_LDADD)
-
-test_bt_ctf_field_type_validation_LDADD = $(COMMON_TEST_LDADD)
-
-test_ir_visit_LDADD = $(COMMON_TEST_LDADD)
-
-test_bt_notification_heap_LDADD = $(COMMON_TEST_LDADD)
-
-test_plugin_LDADD = $(COMMON_TEST_LDADD)
-
-test_graph_topo_LDADD = $(COMMON_TEST_LDADD)
-
-test_cc_prio_map_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_bt_ctf_field_type_validation test_ir_visit \
-	test_bt_notification_heap test_plugin test_graph_topo \
-	test_cc_prio_map test_bt_notification_iterator
+noinst_PROGRAMS = test_bitfield 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_ctf_ir_ref_SOURCES = test_ctf_ir_ref.c
-test_bt_ctf_field_type_validation_SOURCES = test_bt_ctf_field_type_validation.c
-test_ir_visit_SOURCES = test_ir_visit.c
-test_bt_notification_heap_SOURCES = test_bt_notification_heap.c
-test_plugin_SOURCES = test_plugin.c
+test_trace_ir_ref_SOURCES = test_trace_ir_ref.c
 test_graph_topo_SOURCES = test_graph_topo.c
-test_cc_prio_map_SOURCES = test_cc_prio_map.c
-test_bt_notification_iterator_SOURCES = test_bt_notification_iterator.c
-
-check_SCRIPTS = test_ctf_writer_complete \
-		test_plugin_complete
-
-#FIXME
-#if ENABLE_DEBUG_INFO
-#test_dwarf_LDFLAGS = -static
-#test_dwarf_LDADD = $(LIBTAP) \
-#	$(top_builddir)/lib/libbabeltrace.la \
-#	$(top_builddir)/lib/libdebug-info.la
-#test_dwarf_SOURCES = test_dwarf.c
 
-#test_bin_info_LDFLAGS = -static
-#test_bin_info_LDADD = $(LIBTAP) \
-#	$(top_builddir)/lib/libbabeltrace.la \
-#	$(top_builddir)/lib/libdebug-info.la
-#test_bin_info_SOURCES = test_bin_info.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
 
-#noinst_PROGRAMS += test_dwarf test_bin_info
-#check_SCRIPTS += test_dwarf_complete test_bin_info_complete
-#endif
+dist_check_SCRIPTS = test_plugin