From 7cd32006b122be37339862b7a6b5a06206bdd58c Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 24 Oct 2023 14:26:20 -0400 Subject: [PATCH] Reduce the number of Makefiles in 'src/plugins/common' Continue the effort started by Simon to reduce the overall number of Makefiles to allow for faster parallel builds. Change-Id: Ic90c2c4e60f0af76bb0fde784d3cb64030aa7f44 Signed-off-by: Michael Jeanson Reviewed-on: https://review.lttng.org/c/babeltrace/+/11152 Reviewed-by: Philippe Proulx --- configure.ac | 2 -- src/plugins/common/Makefile.am | 12 +++++++++++- src/plugins/common/muxing/Makefile.am | 5 ----- src/plugins/common/param-validation/Makefile.am | 7 ------- 4 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 src/plugins/common/muxing/Makefile.am delete mode 100644 src/plugins/common/param-validation/Makefile.am diff --git a/configure.ac b/configure.ac index de790161..a30c6bad 100644 --- a/configure.ac +++ b/configure.ac @@ -839,8 +839,6 @@ AC_CONFIG_FILES([ src/logging/Makefile src/Makefile src/plugins/common/Makefile - src/plugins/common/muxing/Makefile - src/plugins/common/param-validation/Makefile src/plugins/ctf/common/metadata/Makefile src/plugins/ctf/Makefile src/plugins/lttng-utils/debug-info/Makefile diff --git a/src/plugins/common/Makefile.am b/src/plugins/common/Makefile.am index 58321ebe..dab15fe3 100644 --- a/src/plugins/common/Makefile.am +++ b/src/plugins/common/Makefile.am @@ -1,3 +1,13 @@ # SPDX-License-Identifier: MIT -SUBDIRS = muxing param-validation +noinst_LTLIBRARIES = \ + muxing/libbabeltrace2-plugins-common-muxing.la \ + param-validation/libbabeltrace2-param-validation.la + +muxing_libbabeltrace2_plugins_common_muxing_la_SOURCES = \ + muxing/muxing.c \ + muxing/muxing.h + +param_validation_libbabeltrace2_param_validation_la_SOURCES = \ + param-validation/param-validation.c \ + param-validation/param-validation.h diff --git a/src/plugins/common/muxing/Makefile.am b/src/plugins/common/muxing/Makefile.am deleted file mode 100644 index 1ab43439..00000000 --- a/src/plugins/common/muxing/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: MIT - -noinst_LTLIBRARIES = libbabeltrace2-plugins-common-muxing.la - -libbabeltrace2_plugins_common_muxing_la_SOURCES = muxing.c muxing.h diff --git a/src/plugins/common/param-validation/Makefile.am b/src/plugins/common/param-validation/Makefile.am deleted file mode 100644 index d431b449..00000000 --- a/src/plugins/common/param-validation/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: MIT - -noinst_LTLIBRARIES = libbabeltrace2-param-validation.la - -libbabeltrace2_param_validation_la_SOURCES = \ - param-validation.c \ - param-validation.h -- 2.34.1