X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Futils%2FMakefile.am;h=474f1757d92afb0246099d0a75f3a85bbc2f6904;hb=8bf30fb24050dcad2be6d13c32aff2c17bae6139;hp=4631d95015e689d4b1b2996772aa8d0006d64a7a;hpb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;p=babeltrace.git

diff --git a/src/plugins/utils/Makefile.am b/src/plugins/utils/Makefile.am
index 4631d950..474f1757 100644
--- a/src/plugins/utils/Makefile.am
+++ b/src/plugins/utils/Makefile.am
@@ -1,24 +1,31 @@
 # SPDX-License-Identifier: MIT
 
-SUBDIRS = dummy muxer counter trimmer
-
 plugindir = "$(BABELTRACE_PLUGINS_DIR)"
 plugin_LTLIBRARIES = babeltrace-plugin-utils.la
 
-babeltrace_plugin_utils_la_SOURCES = plugin.c
+babeltrace_plugin_utils_la_SOURCES = \
+	counter/counter.c \
+	counter/counter.h \
+	dummy/dummy.c \
+	dummy/dummy.h \
+	muxer/muxer.c \
+	muxer/muxer.h \
+	trimmer/trimmer.c \
+	trimmer/trimmer.h \
+	plugin.c
+
 babeltrace_plugin_utils_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	$(LT_NO_UNDEFINED) \
-	-avoid-version -module
+	-avoid-version -module $(LD_NOTEXT)
+
 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
+	$(top_builddir)/src/plugins/common/muxing/libbabeltrace2-plugins-common-muxing.la
 
 if !ENABLE_BUILT_IN_PLUGINS
 babeltrace_plugin_utils_la_LIBADD += \
 	$(top_builddir)/src/lib/libbabeltrace2.la \
 	$(top_builddir)/src/common/libbabeltrace2-common.la \
-	$(top_builddir)/src/logging/libbabeltrace2-logging.la \
+	$(top_builddir)/src/logging/liblogging.la \
 	$(top_builddir)/src/plugins/common/param-validation/libbabeltrace2-param-validation.la
 endif