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 <mjeanson@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/11152
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/configure.ac b/configure.ac
index de79016152b3d0cf3376265debb3ad442a17fab3..a30c6bad6fa29f48953ba7c49b702915550423c3 100644 (file)
--- 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 58321ebeb3048f84349b9059f1001e6303fedd09..dab15fe3e90b5162f984c1488bc184e607e2b123 100644 (file)
--- 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 (file)
index 1ab4343..0000000
--- 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 (file)
index d431b44..0000000
--- 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