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

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

diff --git a/configure.ac b/configure.ac
index 109f021e02e0ef3dbd4d87c6a92585e0a6b853c6..6d7c53e2f801ff4d6fa283c83c95ff04df557625 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -843,10 +843,7 @@ AC_CONFIG_FILES([
   src/plugins/ctf/Makefile
   src/plugins/lttng-utils/Makefile
   src/plugins/Makefile
-  src/plugins/text/dmesg/Makefile
   src/plugins/text/Makefile
-  src/plugins/text/pretty/Makefile
-  src/plugins/text/details/Makefile
   src/plugins/utils/Makefile
   src/py-common/Makefile
   src/python-plugin-provider/Makefile

diff --git a/src/plugins/text/Makefile.am b/src/plugins/text/Makefile.am
index 9e69ad8016aed8bc38eee57dab8f88459a7b4dc8..5d136ad3afed8df99d14724cea926f93814f07d1 100644 (file)
--- a/src/plugins/text/Makefile.am
+++ b/src/plugins/text/Makefile.am
@@ -1,20 +1,29 @@
 # SPDX-License-Identifier: MIT
 
-SUBDIRS = pretty dmesg details
-
 plugindir = "$(BABELTRACE_PLUGINS_DIR)"
 plugin_LTLIBRARIES = babeltrace-plugin-text.la
 
-babeltrace_plugin_text_la_SOURCES = plugin.c
+babeltrace_plugin_text_la_SOURCES = \
+       details/colors.h \
+       details/details.c \
+       details/details.h \
+       details/obj-lifetime-mgmt.c \
+       details/obj-lifetime-mgmt.h \
+       details/write.c \
+       details/write.h \
+       dmesg/dmesg.c \
+       dmesg/dmesg.h \
+       pretty/pretty.c \
+       pretty/pretty.h \
+       pretty/print.c \
+       plugin.c
+
 babeltrace_plugin_text_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        $(LT_NO_UNDEFINED) \
        -avoid-version -module $(LD_NOTEXT)
 
-babeltrace_plugin_text_la_LIBADD = \
-       pretty/libbabeltrace2-plugin-text-pretty-cc.la \
-       dmesg/libbabeltrace2-plugin-text-dmesg-cc.la \
-       details/libbabeltrace2-plugin-text-details-cc.la
+babeltrace_plugin_text_la_LIBADD =
 
 if !ENABLE_BUILT_IN_PLUGINS
 babeltrace_plugin_text_la_LIBADD += \

diff --git a/src/plugins/text/details/Makefile.am b/src/plugins/text/details/Makefile.am
deleted file mode 100644 (file)
index 3595fe9..0000000
--- a/src/plugins/text/details/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-noinst_LTLIBRARIES = libbabeltrace2-plugin-text-details-cc.la
-libbabeltrace2_plugin_text_details_cc_la_SOURCES = \
-       details.c details.h \
-       write.c write.h \
-       obj-lifetime-mgmt.c obj-lifetime-mgmt.h \
-       colors.h

diff --git a/src/plugins/text/dmesg/Makefile.am b/src/plugins/text/dmesg/Makefile.am
deleted file mode 100644 (file)
index 63fcef3..0000000
--- a/src/plugins/text/dmesg/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-noinst_LTLIBRARIES = libbabeltrace2-plugin-text-dmesg-cc.la
-
-# ctf-text plugin
-libbabeltrace2_plugin_text_dmesg_cc_la_SOURCES = \
-       dmesg.c \
-       dmesg.h

diff --git a/src/plugins/text/pretty/Makefile.am b/src/plugins/text/pretty/Makefile.am
deleted file mode 100644 (file)
index 0753ebf..0000000
--- a/src/plugins/text/pretty/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-noinst_LTLIBRARIES = libbabeltrace2-plugin-text-pretty-cc.la
-
-# ctf-text plugin
-libbabeltrace2_plugin_text_pretty_cc_la_SOURCES = \
-       pretty.c \
-       pretty.h \
-       print.c