Reduce the number of Makefiles in 'src/plugins/utils'

Continue the effort started by Simon to reduce the overall number of
Makefiles to allow for faster parallel builds. Also reduce the number of
convenience libraries for faster linking.

Change-Id: I772572c3dc1d2481ec94526a4301d4bb79f9d855
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/11151
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/.gitignore b/.gitignore
index f1ae13d93404e0473383d7bbdec8254f57edc68b..70a284b22df6b5600fbf263ddc33c05953d1a49f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@
 .deps
 *.bkp
 *.trs
+.dirstamp
 /src/plugins/ctf/common/metadata/lexer.cpp
 /src/plugins/ctf/common/metadata/parser.cpp
 /src/plugins/ctf/common/metadata/parser.hpp

diff --git a/configure.ac b/configure.ac
index d7177918cd7cfd6a72b4f7d6218cbb90b6efd896..de79016152b3d0cf3376265debb3ad442a17fab3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -850,11 +850,7 @@ AC_CONFIG_FILES([
   src/plugins/text/Makefile
   src/plugins/text/pretty/Makefile
   src/plugins/text/details/Makefile
-  src/plugins/utils/counter/Makefile
-  src/plugins/utils/dummy/Makefile
   src/plugins/utils/Makefile
-  src/plugins/utils/muxer/Makefile
-  src/plugins/utils/trimmer/Makefile
   src/py-common/Makefile
   src/python-plugin-provider/Makefile
   src/param-parse/Makefile

diff --git a/src/plugins/utils/Makefile.am b/src/plugins/utils/Makefile.am
index 71881317277c92c8e9a217740caf1ffe83ad931e..44010153a5fd71c07647d66d0be7240eae15fb6f 100644 (file)
--- a/src/plugins/utils/Makefile.am
+++ b/src/plugins/utils/Makefile.am
@@ -1,20 +1,26 @@
 # 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 $(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 += \

diff --git a/src/plugins/utils/counter/Makefile.am b/src/plugins/utils/counter/Makefile.am
deleted file mode 100644 (file)
index 6766851..0000000
--- a/src/plugins/utils/counter/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-noinst_LTLIBRARIES = libbabeltrace2-plugin-counter-cc.la
-libbabeltrace2_plugin_counter_cc_la_SOURCES = \
-       counter.c \
-       counter.h

diff --git a/src/plugins/utils/dummy/Makefile.am b/src/plugins/utils/dummy/Makefile.am
deleted file mode 100644 (file)
index 7d6f993..0000000
--- a/src/plugins/utils/dummy/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-noinst_LTLIBRARIES = libbabeltrace2-plugin-dummy-cc.la
-libbabeltrace2_plugin_dummy_cc_la_SOURCES = dummy.c dummy.h

diff --git a/src/plugins/utils/muxer/Makefile.am b/src/plugins/utils/muxer/Makefile.am
deleted file mode 100644 (file)
index 62c3748..0000000
--- a/src/plugins/utils/muxer/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-noinst_LTLIBRARIES = libbabeltrace2-plugin-muxer.la
-libbabeltrace2_plugin_muxer_la_SOURCES = muxer.c muxer.h
-
-libbabeltrace2_plugin_muxer_la_LIBADD = \
-       $(top_builddir)/src/plugins/common/muxing/libbabeltrace2-plugins-common-muxing.la

diff --git a/src/plugins/utils/trimmer/Makefile.am b/src/plugins/utils/trimmer/Makefile.am
deleted file mode 100644 (file)
index b1f1b6b..0000000
--- a/src/plugins/utils/trimmer/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-noinst_LTLIBRARIES = libbabeltrace2-plugin-trimmer.la
-libbabeltrace2_plugin_trimmer_la_SOURCES = \
-       trimmer.c \
-       trimmer.h