From e4b448245b0bb4f13921d4f619219feb5dbd9fa1 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 24 Oct 2023 14:14:41 -0400 Subject: [PATCH] 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 Reviewed-on: https://review.lttng.org/c/babeltrace/+/11151 Reviewed-by: Philippe Proulx --- .gitignore | 1 + configure.ac | 4 ---- src/plugins/utils/Makefile.am | 20 +++++++++++++------- src/plugins/utils/counter/Makefile.am | 6 ------ src/plugins/utils/dummy/Makefile.am | 4 ---- src/plugins/utils/muxer/Makefile.am | 7 ------- src/plugins/utils/trimmer/Makefile.am | 6 ------ 7 files changed, 14 insertions(+), 34 deletions(-) delete mode 100644 src/plugins/utils/counter/Makefile.am delete mode 100644 src/plugins/utils/dummy/Makefile.am delete mode 100644 src/plugins/utils/muxer/Makefile.am delete mode 100644 src/plugins/utils/trimmer/Makefile.am diff --git a/.gitignore b/.gitignore index f1ae13d9..70a284b2 100644 --- 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 d7177918..de790161 100644 --- 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 71881317..44010153 100644 --- 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 index 67668517..00000000 --- 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 index 7d6f993e..00000000 --- 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 index 62c37486..00000000 --- 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 index b1f1b6bd..00000000 --- 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 -- 2.34.1