X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Futils%2FMakefile.am;h=3872c4dcaddba6b81d8aa052edb5fc44ee1f9209;hb=9ffc0257721b043158a502d3fcd7eb275630a95b;hp=4f8f069067f04dc56e642954c3bc5b3ed7f632fa;hpb=c5410abe92de715d1e82b5b9e77c2e7238b63fe7;p=babeltrace.git

diff --git a/plugins/utils/Makefile.am b/plugins/utils/Makefile.am
index 4f8f0690..3872c4dc 100644
--- a/plugins/utils/Makefile.am
+++ b/plugins/utils/Makefile.am
@@ -1,20 +1,24 @@
-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 = libbabeltrace-plugin-utils.la
+plugin_LTLIBRARIES = babeltrace-plugin-utils.la
 
-libbabeltrace_plugin_utils_la_SOURCES = plugin.c
-libbabeltrace_plugin_utils_la_LDFLAGS = \
+babeltrace_plugin_utils_la_SOURCES = plugin.c
+babeltrace_plugin_utils_la_LDFLAGS = \
 	$(LT_NO_UNDEFINED) \
-	-version-info $(BABELTRACE_LIBRARY_VERSION)
-libbabeltrace_plugin_utils_la_LIBADD = \
+	-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
-libbabeltrace_plugin_utils_la_LIBADD += \
-	$(top_builddir)/lib/libbabeltrace.la
+if !ENABLE_BUILT_IN_PLUGINS
+babeltrace_plugin_utils_la_LIBADD += \
+	$(top_builddir)/lib/libbabeltrace.la \
+	$(top_builddir)/plugins/libctfcopytrace/libctfcopytrace.la \
+	$(top_builddir)/common/libbabeltrace-common.la \
+	$(top_builddir)/logging/libbabeltrace-logging.la
 endif