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

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

diff --git a/plugins/utils/Makefile.am b/plugins/utils/Makefile.am
index 8a9d1af2f9b06be7fa7cb502954664e530964149..9211dd9e6a920a8af0f4c53368251a6749c304aa 100644 (file)
--- a/plugins/utils/Makefile.am
+++ b/plugins/utils/Makefile.am
@@ -1,14 +1,23 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins
+AM_CPPFLAGS += -I$(top_srcdir)/plugins
 
-SUBDIRS = dummy trimmer .
+SUBDIRS = dummy muxer counter trimmer .
 
 plugindir = "$(PLUGINSDIR)"
-plugin_LTLIBRARIES = libbabeltrace-plugin-utils.la
-
-libbabeltrace_plugin_utils_la_SOURCES = plugin.c
-libbabeltrace_plugin_utils_la_LDFLAGS = \
-       -version-info $(BABELTRACE_LIBRARY_VERSION)
-libbabeltrace_plugin_utils_la_LIBADD = \
-       $(top_builddir)/lib/libbabeltrace.la \
-       dummy/libbabeltrace-plugin-dummy-cc.la \
-       trimmer/libbabeltrace-plugin-dummy-cc.la
+plugin_LTLIBRARIES = babeltrace-plugin-utils.la
+
+babeltrace_plugin_utils_la_SOURCES = plugin.c
+babeltrace_plugin_utils_la_LDFLAGS = \
+       $(LT_NO_UNDEFINED) \
+       -avoid-version -module
+babeltrace_plugin_utils_la_LIBADD = \
+       dummy/libbabeltrace2-plugin-dummy-cc.la \
+       muxer/libbabeltrace2-plugin-muxer.la \
+       counter/libbabeltrace2-plugin-counter-cc.la \
+       trimmer/libbabeltrace2-plugin-trimmer.la
+
+if !ENABLE_BUILT_IN_PLUGINS
+babeltrace_plugin_utils_la_LIBADD += \
+       $(top_builddir)/lib/libbabeltrace2.la \
+       $(top_builddir)/common/libbabeltrace2-common.la \
+       $(top_builddir)/logging/libbabeltrace2-logging.la
+endif