X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2FMakefile.am;h=2bcc630d6fc0f3479ba2218aa59897dcbc2eb4df;hb=050887523e904350cf8a999fd232c3bf9e338b9c;hp=ca5ffc3f6b4d46552e7ba24317a42a47266beed5;hpb=1b83271bb496e994fdb6ba4047e88824ec391d43;p=babeltrace.git

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index ca5ffc3f..2bcc630d 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = writer .
 
-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
 
@@ -51,24 +51,6 @@ test_bt_notification_iterator_SOURCES = test_bt_notification_iterator.c
 
 check_SCRIPTS = test_ctf_writer_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
-
-#noinst_PROGRAMS += test_dwarf test_bin_info
-#check_SCRIPTS += test_dwarf_complete test_bin_info_complete
-#endif
-
 LOG_DRIVER_FLAGS='--merge'
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh
 
@@ -83,18 +65,13 @@ TESTS = test_bitfield \
 	test_cc_prio_map \
 	test_bt_notification_iterator
 
-if ENABLE_DEBUG_INFO
-TESTS += test_dwarf_complete \
-	test_bin_info_complete
-endif
-
-if USE_PYTHON
+if ENABLE_PYTHON_BINDINGS
 TESTS +=
 	writer/test_ctf_writer_no_packet_context.py \
 	writer/test_ctf_writer_empty_packet.py
 endif
 
-if !BUILT_IN_PLUGINS
+if !ENABLE_BUILT_IN_PLUGINS
 noinst_PROGRAMS += test_plugin
 test_plugin_LDADD = $(COMMON_TEST_LDADD)
 test_plugin_SOURCES = test_plugin.c