tap-driver.sh: flush stdout after each test result

[babeltrace.git] / plugins / lttng-utils / Makefile.am

diff --git a/plugins/lttng-utils/Makefile.am b/plugins/lttng-utils/Makefile.am
index f8262926617ae3f380b85a23789fffb824b38ffb..1d555a55544964997f4b61854a1d4cfab1c4b29e 100644 (file)
--- a/plugins/lttng-utils/Makefile.am
+++ b/plugins/lttng-utils/Makefile.am
@@ -1,32 +1,20 @@
-AM_CPPFLAGS += -I$(top_srcdir)/plugins \
-           -I$(top_srcdir)/plugins/libctfcopytrace
+SUBDIRS =
 
-noinst_LTLIBRARIES = libdebug-info.la
-libdebug_info_la_SOURCES = \
-       bin-info.c \
-       bin-info.h \
-       crc32.c \
-       crc32.h \
-       debug-info.c \
-       debug-info.h \
-       dwarf.c \
-       dwarf.h \
-       logging.c \
-       logging.h
+babeltrace_plugin_lttng_utils_la_LIBADD =
+
+if ENABLE_DEBUG_INFO
+SUBDIRS += debug-info
+babeltrace_plugin_lttng_utils_la_LIBADD += \
+       debug-info/libdebug-info.la
+endif
+
+AM_CPPFLAGS += -I$(top_srcdir)/plugins
 
 plugindir = "$(PLUGINSDIR)"
 plugin_LTLIBRARIES = babeltrace-plugin-lttng-utils.la
 
 babeltrace_plugin_lttng_utils_la_SOURCES = \
-       plugin.c \
-       utils.c \
-       copy.c \
-       utils.h \
-       copy.h \
-       logging.h
-
-babeltrace_plugin_lttng_utils_la_LIBADD = \
-       libdebug-info.la
+       plugin.c
 
 babeltrace_plugin_lttng_utils_la_LDFLAGS = \
        $(LT_NO_UNDEFINED) \
@@ -35,8 +23,7 @@ babeltrace_plugin_lttng_utils_la_LDFLAGS = \
 
 if !ENABLE_BUILT_IN_PLUGINS
 babeltrace_plugin_lttng_utils_la_LIBADD += \
-       $(top_builddir)/lib/libbabeltrace.la \
-       $(top_builddir)/common/libbabeltrace-common.la \
-       $(top_builddir)/logging/libbabeltrace-logging.la \
-       $(top_builddir)/plugins/libctfcopytrace/libctfcopytrace.la
+       $(top_builddir)/lib/libbabeltrace2.la \
+       $(top_builddir)/common/libbabeltrace2-common.la \
+       $(top_builddir)/logging/libbabeltrace2-logging.la
 endif