tests: build system spring cleanup

[babeltrace.git] / tests / plugins / Makefile.am

diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am
index e68d66717021dddd723e9664662accc5778f5f3c..8744e8ae32fe771aed65d89920a77a7e46244c25 100644 (file)
--- a/tests/plugins/Makefile.am
+++ b/tests/plugins/Makefile.am
@@ -1,13 +1,11 @@
 AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(top_srcdir)/plugins
 
 LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
-COMMON_TEST_LDADD = $(LIBTAP) \
-       $(top_builddir)/lib/libbabeltrace.la \
-       $(top_builddir)/common/libbabeltrace-common.la \
-       $(top_builddir)/logging/libbabeltrace-logging.la \
-       $(top_builddir)/compat/libcompat.la
 
-check_SCRIPTS =
+dist_check_SCRIPTS = \
+       test_lttng_utils_debug_info.py\
+       ctf/test_query_trace_info.py
+
 noinst_PROGRAMS =
 
 if !ENABLE_BUILT_IN_PLUGINS
@@ -15,8 +13,11 @@ if !ENABLE_BUILT_IN_PLUGINS
 endif # !ENABLE_BUILT_IN_PLUGINS
 
 if ENABLE_DEBUG_INFO
+noinst_PROGRAMS += test_dwarf test_bin_info
+
 test_dwarf_LDADD = \
-       $(top_builddir)/plugins/lttng-utils/libdebug-info.la \
+       $(top_builddir)/plugins/lttng-utils/debug-info/libdebug-info.la \
+       $(top_builddir)/fd-cache/libbabeltrace-fd-cache.la \
        $(top_builddir)/logging/libbabeltrace-logging.la \
        $(top_builddir)/common/libbabeltrace-common.la \
        $(ELFUTILS_LIBS) \
@@ -24,21 +25,11 @@ test_dwarf_LDADD = \
 test_dwarf_SOURCES = test_dwarf.c
 
 test_bin_info_LDADD = \
-       $(top_builddir)/plugins/lttng-utils/libdebug-info.la \
+       $(top_builddir)/plugins/lttng-utils/debug-info/libdebug-info.la \
+       $(top_builddir)/fd-cache/libbabeltrace-fd-cache.la \
        $(top_builddir)/logging/libbabeltrace-logging.la \
        $(top_builddir)/common/libbabeltrace-common.la \
        $(ELFUTILS_LIBS) \
        $(LIBTAP)
 test_bin_info_SOURCES = test_bin_info.c
-
-noinst_PROGRAMS += test_dwarf test_bin_info
-check_SCRIPTS += test_dwarf_complete test_bin_info_complete
-
-if !ENABLE_BUILT_IN_PLUGINS
-if ENABLE_PYTHON_BINDINGS
-check_SCRIPTS += test_lttng_utils_debug_info
-endif # !ENABLE_BUILT_IN_PLUGINS
-endif # ENABLE_PYTHON_BINDINGS
 endif # ENABLE_DEBUG_INFO
-
-EXTRA_DIST = test_lttng_utils_debug_info.py