ctf: reduce the number of `Makefile.am`s

This should help speeding parallel builds a bit, by reducing the time
spent in directories with few source files.  The time necessary to build
the intermediary .la libraries is also non-negligible (at least on
Windows), so having less of those should help.

I kept `common/metadata/Makefile.am`, because it has a lot of complexity
specific to the use of bison, I think it's good to keep it in its own
file.

Change-Id: I6b7a5ca370d6b4481bda3649ab51009e70a0e393
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/11137
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/configure.ac b/configure.ac
index 95483337b0b633a6bee32fd2b4ac2e0f5a0d060c..d7177918cd7cfd6a72b4f7d6218cbb90b6efd896 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ AC_CANONICAL_HOST
 ## Automake base setup ##
 ##                     ##
 
-AM_INIT_AUTOMAKE([1.13 foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc -Wall -Wno-portability -Werror])
+AM_INIT_AUTOMAKE([1.13 foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc subdir-objects -Wall -Wno-portability -Werror])
 AM_MAINTAINER_MODE([enable])
 
 # Enable silent rules by default
@@ -841,13 +841,7 @@ AC_CONFIG_FILES([
   src/plugins/common/Makefile
   src/plugins/common/muxing/Makefile
   src/plugins/common/param-validation/Makefile
-  src/plugins/ctf/common/bfcr/Makefile
-  src/plugins/ctf/common/Makefile
   src/plugins/ctf/common/metadata/Makefile
-  src/plugins/ctf/common/msg-iter/Makefile
-  src/plugins/ctf/fs-sink/Makefile
-  src/plugins/ctf/fs-src/Makefile
-  src/plugins/ctf/lttng-live/Makefile
   src/plugins/ctf/Makefile
   src/plugins/lttng-utils/debug-info/Makefile
   src/plugins/lttng-utils/Makefile

diff --git a/src/plugins/ctf/Makefile.am b/src/plugins/ctf/Makefile.am
index b5050b8d280595f99b083235134807bd6c0b4b5f..78e75af7a50c4190b0ef2c7b041b87b7fb93b651 100644 (file)
--- a/src/plugins/ctf/Makefile.am
+++ b/src/plugins/ctf/Makefile.am
@@ -1,15 +1,49 @@
 # SPDX-License-Identifier: MIT
 
-SUBDIRS = common \
-       fs-src \
-       fs-sink \
-       lttng-live
+SUBDIRS = common/metadata
 
 plugindir = "$(BABELTRACE_PLUGINS_DIR)"
 plugin_LTLIBRARIES = babeltrace-plugin-ctf.la
 
 # ctf plugin
-babeltrace_plugin_ctf_la_SOURCES = plugin.cpp
+babeltrace_plugin_ctf_la_SOURCES = \
+       plugin.cpp \
+       common/bfcr/bfcr.cpp \
+       common/bfcr/bfcr.hpp \
+       common/msg-iter/msg-iter.cpp \
+       common/msg-iter/msg-iter.hpp \
+       common/print.hpp \
+       fs-sink/fs-sink.cpp \
+       fs-sink/fs-sink.hpp \
+       fs-sink/fs-sink-ctf-meta.hpp \
+       fs-sink/fs-sink-stream.cpp \
+       fs-sink/fs-sink-stream.hpp \
+       fs-sink/fs-sink-trace.cpp \
+       fs-sink/fs-sink-trace.hpp \
+       fs-sink/translate-ctf-ir-to-tsdl.cpp \
+       fs-sink/translate-ctf-ir-to-tsdl.hpp \
+       fs-sink/translate-trace-ir-to-ctf-ir.cpp \
+       fs-sink/translate-trace-ir-to-ctf-ir.hpp \
+       fs-src/data-stream-file.cpp \
+       fs-src/data-stream-file.hpp \
+       fs-src/file.cpp \
+       fs-src/file.hpp \
+       fs-src/fs.cpp \
+       fs-src/fs.hpp \
+       fs-src/lttng-index.hpp \
+       fs-src/metadata.cpp \
+       fs-src/metadata.hpp \
+       fs-src/query.hpp \
+       fs-src/query.cpp \
+       lttng-live/data-stream.cpp \
+       lttng-live/data-stream.hpp \
+       lttng-live/lttng-live.cpp \
+       lttng-live/lttng-live.hpp \
+       lttng-live/metadata.cpp \
+       lttng-live/metadata.hpp \
+       lttng-live/viewer-connection.cpp \
+       lttng-live/viewer-connection.hpp \
+       lttng-live/lttng-viewer-abi.hpp
 
 babeltrace_plugin_ctf_la_LDFLAGS = \
        $(AM_LDFLAGS) \
@@ -17,16 +51,19 @@ babeltrace_plugin_ctf_la_LDFLAGS = \
        -avoid-version -module $(LD_NOTEXT)
 
 babeltrace_plugin_ctf_la_LIBADD = \
-       common/libbabeltrace2-plugin-ctf-common.la \
-       fs-sink/libbabeltrace2-plugin-ctf-fs-sink.la \
-       fs-src/libbabeltrace2-plugin-ctf-fs-src.la \
-       lttng-live/libbabeltrace2-plugin-ctf-lttng-live.la \
+       common/metadata/libctf-parser.la \
+       common/metadata/libctf-ast.la \
        $(top_builddir)/src/plugins/common/param-validation/libbabeltrace2-param-validation.la
 
+if BABELTRACE_BUILD_WITH_MINGW
+babeltrace_plugin_ctf_la_LIBADD += -lws2_32
+endif
+
 if !ENABLE_BUILT_IN_PLUGINS
 babeltrace_plugin_ctf_la_LIBADD += \
        $(top_builddir)/src/lib/libbabeltrace2.la \
        $(top_builddir)/src/logging/libbabeltrace2-logging.la \
+       $(top_builddir)/src/plugins/common/muxing/libbabeltrace2-plugins-common-muxing.la \
        $(top_builddir)/src/common/libbabeltrace2-common.la \
        $(top_builddir)/src/ctfser/libbabeltrace2-ctfser.la
 endif

diff --git a/src/plugins/ctf/common/Makefile.am b/src/plugins/ctf/common/Makefile.am
deleted file mode 100644 (file)
index 78b76fe..0000000
--- a/src/plugins/ctf/common/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-SUBDIRS = metadata bfcr msg-iter
-
-noinst_LTLIBRARIES = libbabeltrace2-plugin-ctf-common.la
-libbabeltrace2_plugin_ctf_common_la_SOURCES = print.hpp
-libbabeltrace2_plugin_ctf_common_la_LIBADD =           \
-       $(builddir)/metadata/libctf-parser.la           \
-       $(builddir)/metadata/libctf-ast.la              \
-       $(builddir)/bfcr/libctf-bfcr.la                 \
-       $(builddir)/msg-iter/libctf-msg-iter.la

diff --git a/src/plugins/ctf/common/bfcr/Makefile.am b/src/plugins/ctf/common/bfcr/Makefile.am
deleted file mode 100644 (file)
index 17b7705..0000000
--- a/src/plugins/ctf/common/bfcr/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-noinst_LTLIBRARIES = libctf-bfcr.la
-libctf_bfcr_la_SOURCES = \
-       bfcr.cpp \
-       bfcr.hpp

diff --git a/src/plugins/ctf/common/msg-iter/Makefile.am b/src/plugins/ctf/common/msg-iter/Makefile.am
deleted file mode 100644 (file)
index d963df7..0000000
--- a/src/plugins/ctf/common/msg-iter/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-noinst_LTLIBRARIES = libctf-msg-iter.la
-
-libctf_msg_iter_la_SOURCES = \
-       msg-iter.cpp \
-       msg-iter.hpp

diff --git a/src/plugins/ctf/fs-sink/Makefile.am b/src/plugins/ctf/fs-sink/Makefile.am
deleted file mode 100644 (file)
index ef6e399..0000000
--- a/src/plugins/ctf/fs-sink/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-noinst_LTLIBRARIES = libbabeltrace2-plugin-ctf-fs-sink.la
-
-libbabeltrace2_plugin_ctf_fs_sink_la_LIBADD =
-libbabeltrace2_plugin_ctf_fs_sink_la_SOURCES = \
-       fs-sink.cpp \
-       fs-sink.hpp \
-       fs-sink-ctf-meta.hpp \
-       translate-trace-ir-to-ctf-ir.cpp \
-       translate-trace-ir-to-ctf-ir.hpp \
-       translate-ctf-ir-to-tsdl.cpp \
-       translate-ctf-ir-to-tsdl.hpp \
-       fs-sink-stream.cpp \
-       fs-sink-stream.hpp \
-       fs-sink-trace.cpp \
-       fs-sink-trace.hpp

diff --git a/src/plugins/ctf/fs-src/Makefile.am b/src/plugins/ctf/fs-src/Makefile.am
deleted file mode 100644 (file)
index cb990b6..0000000
--- a/src/plugins/ctf/fs-src/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-noinst_LTLIBRARIES = libbabeltrace2-plugin-ctf-fs-src.la
-
-libbabeltrace2_plugin_ctf_fs_src_la_SOURCES = \
-       data-stream-file.cpp \
-       data-stream-file.hpp \
-       file.cpp \
-       file.hpp \
-       fs.cpp \
-       fs.hpp \
-       lttng-index.hpp \
-       metadata.cpp \
-       metadata.hpp \
-       query.hpp \
-       query.cpp

diff --git a/src/plugins/ctf/lttng-live/Makefile.am b/src/plugins/ctf/lttng-live/Makefile.am
deleted file mode 100644 (file)
index 53761a7..0000000
--- a/src/plugins/ctf/lttng-live/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-libbabeltrace2_plugin_ctf_lttng_live_la_SOURCES = \
-               lttng-live.cpp \
-               lttng-live.hpp \
-               data-stream.cpp \
-               data-stream.hpp \
-               metadata.cpp \
-               metadata.hpp \
-               viewer-connection.cpp \
-               viewer-connection.hpp \
-               lttng-viewer-abi.hpp
-
-libbabeltrace2_plugin_ctf_lttng_live_la_LIBADD =
-
-if !ENABLE_BUILT_IN_PLUGINS
-libbabeltrace2_plugin_ctf_lttng_live_la_LIBADD += \
-       $(top_builddir)/src/plugins/common/muxing/libbabeltrace2-plugins-common-muxing.la
-endif
-
-if BABELTRACE_BUILD_WITH_MINGW
-libbabeltrace2_plugin_ctf_lttng_live_la_LIBADD += -lws2_32
-endif
-
-noinst_LTLIBRARIES = libbabeltrace2-plugin-ctf-lttng-live.la