Completely rework configure.ac

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

diff --git a/plugins/utils/Makefile.am b/plugins/utils/Makefile.am
index 8784d046626fe87b9ec3ec062746158f6fe8e7ca..3872c4dcaddba6b81d8aa052edb5fc44ee1f9209 100644 (file)
--- a/plugins/utils/Makefile.am
+++ b/plugins/utils/Makefile.am
@@ -1,6 +1,6 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/plugins
+AM_CPPFLAGS += -I$(top_srcdir)/plugins
 
-SUBDIRS = dummy trimmer muxer .
+SUBDIRS = dummy counter trimmer muxer .
 
 plugindir = "$(PLUGINSDIR)"
 plugin_LTLIBRARIES = babeltrace-plugin-utils.la
@@ -11,10 +11,14 @@ babeltrace_plugin_utils_la_LDFLAGS = \
        -avoid-version -module
 babeltrace_plugin_utils_la_LIBADD = \
        dummy/libbabeltrace-plugin-dummy-cc.la \
+       counter/libbabeltrace-plugin-counter-cc.la \
        trimmer/libbabeltrace-plugin-trimmer.la \
        muxer/libbabeltrace-plugin-muxer.la
 
-if !BUILT_IN_PLUGINS
+if !ENABLE_BUILT_IN_PLUGINS
 babeltrace_plugin_utils_la_LIBADD += \
-       $(top_builddir)/lib/libbabeltrace.la
+       $(top_builddir)/lib/libbabeltrace.la \
+       $(top_builddir)/plugins/libctfcopytrace/libctfcopytrace.la \
+       $(top_builddir)/common/libbabeltrace-common.la \
+       $(top_builddir)/logging/libbabeltrace-logging.la
 endif