From cf7ed9241d6bd0b02d0af5ca074b1c2a55161fab Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 24 Oct 2023 14:41:24 -0400
Subject: [PATCH] Reduce the number of Makefiles in 'src/plugins/lttng-utils'

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

Change-Id: I339d190fea78fcefd6b3927cccb89db1b4fec6f4
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/11153
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
---
 configure.ac                                  |  1 -
 src/plugins/lttng-utils/Makefile.am           | 42 ++++++++++++++-----
 .../lttng-utils/debug-info/Makefile.am        | 26 ------------
 3 files changed, 32 insertions(+), 37 deletions(-)
 delete mode 100644 src/plugins/lttng-utils/debug-info/Makefile.am

diff --git a/configure.ac b/configure.ac
index a30c6bad..109f021e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -841,7 +841,6 @@ AC_CONFIG_FILES([
   src/plugins/common/Makefile
   src/plugins/ctf/common/metadata/Makefile
   src/plugins/ctf/Makefile
-  src/plugins/lttng-utils/debug-info/Makefile
   src/plugins/lttng-utils/Makefile
   src/plugins/Makefile
   src/plugins/text/dmesg/Makefile
diff --git a/src/plugins/lttng-utils/Makefile.am b/src/plugins/lttng-utils/Makefile.am
index 0beeadf2..ab724777 100644
--- a/src/plugins/lttng-utils/Makefile.am
+++ b/src/plugins/lttng-utils/Makefile.am
@@ -1,15 +1,5 @@
 # SPDX-License-Identifier: MIT
 
-SUBDIRS =
-
-babeltrace_plugin_lttng_utils_la_LIBADD =
-
-if ENABLE_DEBUG_INFO
-SUBDIRS += debug-info
-babeltrace_plugin_lttng_utils_la_LIBADD += \
-	debug-info/libdebug-info.la
-endif
-
 plugindir = "$(BABELTRACE_PLUGINS_DIR)"
 plugin_LTLIBRARIES = babeltrace-plugin-lttng-utils.la
 
@@ -22,6 +12,38 @@ babeltrace_plugin_lttng_utils_la_LDFLAGS = \
 	-avoid-version -module $(LD_NOTEXT) \
 	$(ELFUTILS_LIBS)
 
+babeltrace_plugin_lttng_utils_la_LIBADD =
+
+if ENABLE_DEBUG_INFO
+noinst_LTLIBRARIES = debug-info/libdebug-info.la
+
+debug_info_libdebug_info_la_SOURCES = \
+	debug-info/bin-info.c \
+	debug-info/bin-info.h \
+	debug-info/crc32.c \
+	debug-info/crc32.h \
+	debug-info/debug-info.c \
+	debug-info/debug-info.h \
+	debug-info/dwarf.c \
+	debug-info/dwarf.h \
+	debug-info/trace-ir-data-copy.c \
+	debug-info/trace-ir-data-copy.h \
+	debug-info/trace-ir-mapping.c \
+	debug-info/trace-ir-mapping.h \
+	debug-info/trace-ir-metadata-copy.c \
+	debug-info/trace-ir-metadata-copy.h \
+	debug-info/trace-ir-metadata-field-class-copy.c \
+	debug-info/trace-ir-metadata-field-class-copy.h \
+	debug-info/utils.c \
+	debug-info/utils.h
+
+debug_info_libdebug_info_la_LIBADD = \
+	$(top_builddir)/src/fd-cache/libbabeltrace2-fd-cache.la
+
+babeltrace_plugin_lttng_utils_la_LIBADD += \
+	debug-info/libdebug-info.la
+endif
+
 if !ENABLE_BUILT_IN_PLUGINS
 babeltrace_plugin_lttng_utils_la_LIBADD += \
 	$(top_builddir)/src/lib/libbabeltrace2.la \
diff --git a/src/plugins/lttng-utils/debug-info/Makefile.am b/src/plugins/lttng-utils/debug-info/Makefile.am
deleted file mode 100644
index 9eb500ad..00000000
--- a/src/plugins/lttng-utils/debug-info/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-noinst_LTLIBRARIES = libdebug-info.la
-
-libdebug_info_la_LIBADD = \
-	$(top_builddir)/src/fd-cache/libbabeltrace2-fd-cache.la
-
-libdebug_info_la_SOURCES = \
-	bin-info.c \
-	bin-info.h \
-	crc32.c \
-	crc32.h \
-	debug-info.c \
-	debug-info.h \
-	dwarf.c \
-	dwarf.h \
-	trace-ir-data-copy.c \
-	trace-ir-data-copy.h \
-	trace-ir-mapping.c \
-	trace-ir-mapping.h \
-	trace-ir-metadata-copy.c \
-	trace-ir-metadata-copy.h \
-	trace-ir-metadata-field-class-copy.c \
-	trace-ir-metadata-field-class-copy.h \
-	utils.c \
-	utils.h
-- 
2.34.1