From 6244258c549b206646f2d351281643527c92bc65 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 31 Oct 2023 15:26:15 -0400 Subject: [PATCH] Reduce the number of Makefiles in 'src/' even MOAR! Change-Id: I3dbb16250f62513ba131592c596fbaaf1ba97ffe Signed-off-by: Michael Jeanson Reviewed-on: https://review.lttng.org/c/babeltrace/+/11192 Tested-by: jenkins Reviewed-by: Philippe Proulx --- configure.ac | 9 - src/Makefile.am | 314 +++++++++++++++++- src/bindings/Makefile.am | 5 - src/bindings/python/Makefile.am | 3 - src/plugins/Makefile.am | 7 - src/plugins/common/Makefile.am | 13 - src/plugins/ctf/Makefile.am | 69 ---- src/plugins/ctf/common/metadata/Makefile.am | 93 ------ src/plugins/ctf/common/metadata/lexer.lpp | 8 +- .../ctf/common/metadata/parser-wrap.hpp | 2 +- src/plugins/ctf/common/metadata/parser.ypp | 10 +- src/plugins/lttng-utils/Makefile.am | 53 --- src/plugins/text/Makefile.am | 35 -- src/plugins/utils/Makefile.am | 31 -- tests/param-validation/Makefile.am | 2 +- 15 files changed, 322 insertions(+), 332 deletions(-) delete mode 100644 src/bindings/Makefile.am delete mode 100644 src/bindings/python/Makefile.am delete mode 100644 src/plugins/Makefile.am delete mode 100644 src/plugins/common/Makefile.am delete mode 100644 src/plugins/ctf/Makefile.am delete mode 100644 src/plugins/ctf/common/metadata/Makefile.am delete mode 100644 src/plugins/lttng-utils/Makefile.am delete mode 100644 src/plugins/text/Makefile.am delete mode 100644 src/plugins/utils/Makefile.am diff --git a/configure.ac b/configure.ac index c72e8762..ad5a8cc9 100644 --- a/configure.ac +++ b/configure.ac @@ -814,21 +814,12 @@ AC_CONFIG_FILES([ Makefile src/babeltrace2-ctf-writer.pc src/babeltrace2.pc - src/bindings/Makefile src/bindings/python/bt2/bt2/version.py src/bindings/python/bt2/Makefile src/bindings/python/bt2/setup.py - src/bindings/python/Makefile src/cli/Makefile src/common/Makefile src/Makefile - src/plugins/common/Makefile - src/plugins/ctf/common/metadata/Makefile - src/plugins/ctf/Makefile - src/plugins/lttng-utils/Makefile - src/plugins/Makefile - src/plugins/text/Makefile - src/plugins/utils/Makefile tests/bitfield/Makefile tests/ctf-writer/Makefile tests/lib/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index fdfc93d5..cbc74e3e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,9 +5,11 @@ SUBDIRS = \ common \ . \ - plugins \ - cli \ - bindings + cli + +if ENABLE_PYTHON_BINDINGS +SUBDIRS += bindings/python/bt2 +endif noinst_HEADERS = \ cpp-common/bt2/clock-class.hpp \ @@ -62,6 +64,10 @@ noinst_LTLIBRARIES = \ fd-cache/libfd-cache.la \ logging/liblogging.la \ param-parse/libparam-parse.la \ + plugins/common/muxing/libmuxing.la \ + plugins/common/param-validation/libparam-validation.la \ + plugins/ctf/common/metadata/libctf-ast.la \ + plugins/ctf/common/metadata/libctf-parser.la \ string-format/libstring-format.la argpar_libargpar_la_SOURCES = \ @@ -113,6 +119,119 @@ string_format_libstring_format_la_SOURCES = \ string-format/format-error.c \ string-format/format-error.h +plugins_common_muxing_libmuxing_la_SOURCES = \ + plugins/common/muxing/muxing.c \ + plugins/common/muxing/muxing.h + +plugins_common_param_validation_libparam_validation_la_SOURCES = \ + plugins/common/param-validation/param-validation.c \ + plugins/common/param-validation/param-validation.h + +# Set flags for the Bison based metadata parser +# -t : instrument the parser +# -d : produce a header +# -v : verbose +# -Wno-yacc : disable POSIX Yacc incompatibilities warnings +AM_YFLAGS = \ + -t -d -v -Wno-yacc + +plugins_ctf_common_metadata_libctf_parser_la_SOURCES = \ + plugins/ctf/common/metadata/lexer.lpp \ + plugins/ctf/common/metadata/parser.ypp \ + plugins/ctf/common/metadata/objstack.cpp + +# scanner-symbols.h is included to prefix generated yy_* symbols with bt_. +plugins_ctf_common_metadata_libctf_parser_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -include $(srcdir)/plugins/ctf/common/metadata/scanner-symbols.hpp + +# This library contains (mostly) generated code, silence some warnings that it +# produces. +plugins_ctf_common_metadata_libctf_parser_la_CXXFLAGS = \ + $(AM_CXXFLAGS) \ + -Wno-unused-function \ + -Wno-null-dereference \ + -Wno-missing-field-initializers \ + -Wno-unused-parameter + +plugins_ctf_common_metadata_libctf_ast_la_SOURCES = \ + plugins/ctf/common/metadata/visitor-generate-ir.cpp \ + plugins/ctf/common/metadata/visitor-semantic-validator.cpp \ + plugins/ctf/common/metadata/visitor-parent-links.cpp \ + plugins/ctf/common/metadata/ast.hpp \ + plugins/ctf/common/metadata/objstack.hpp \ + plugins/ctf/common/metadata/parser.hpp \ + plugins/ctf/common/metadata/parser-wrap.hpp \ + plugins/ctf/common/metadata/scanner.hpp \ + plugins/ctf/common/metadata/scanner-symbols.hpp \ + plugins/ctf/common/metadata/decoder.cpp \ + plugins/ctf/common/metadata/decoder.hpp \ + plugins/ctf/common/metadata/decoder-packetized-file-stream-to-buf.cpp \ + plugins/ctf/common/metadata/decoder-packetized-file-stream-to-buf.hpp \ + plugins/ctf/common/metadata/logging.cpp \ + plugins/ctf/common/metadata/logging.hpp \ + plugins/ctf/common/metadata/ctf-meta.hpp \ + plugins/ctf/common/metadata/ctf-meta-visitors.hpp \ + plugins/ctf/common/metadata/ctf-meta-validate.cpp \ + plugins/ctf/common/metadata/ctf-meta-update-meanings.cpp \ + plugins/ctf/common/metadata/ctf-meta-update-in-ir.cpp \ + plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.cpp \ + plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.cpp \ + plugins/ctf/common/metadata/ctf-meta-update-alignments.cpp \ + plugins/ctf/common/metadata/ctf-meta-update-value-storing-indexes.cpp \ + plugins/ctf/common/metadata/ctf-meta-update-stream-class-config.cpp \ + plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.cpp \ + plugins/ctf/common/metadata/ctf-meta-translate.cpp \ + plugins/ctf/common/metadata/ctf-meta-resolve.cpp \ + plugins/ctf/common/metadata/ctf-meta-configure-ir-trace.cpp \ + plugins/ctf/common/metadata/ctf-meta-configure-ir-trace.hpp + +if BABELTRACE_BUILD_WITH_MINGW +plugins_ctf_common_metadata_libctf_ast_la_LIBADD = -lintl -liconv -lole32 +endif + +BUILT_SOURCES = \ + plugins/ctf/common/metadata/parser.hpp + +# Start with empty files to clean +CLEANFILES = +ALL_LOCAL = + +if HAVE_BISON +# We have bison: we can clean the generated parser files +CLEANFILES += \ + plugins/ctf/common/metadata/parser.cpp \ + plugins/ctf/common/metadata/parser.hpp \ + plugins/ctf/common/metadata/parser.output +else # HAVE_BISON +# Create target used to stop the build if we want to build the parser, +# but we don't have the necessary tool to do so +plugins/ctf/common/metadata/parser.cpp plugins/ctf/common/metadata/parser.hpp: plugins/ctf/common/metadata/parser.ypp + @echo "Error: Cannot build target because bison is missing." + @echo "Make sure bison is installed and run the configure script again." + @false + +ALL_LOCAL += \ + plugins/ctf/common/metadata/parser.cpp \ + plugins/ctf/common/metadata/parser.hpp +endif # HAVE_BISON + +if HAVE_FLEX +# We have flex: we can clean the generated lexer files +CLEANFILES += plugins/ctf/common/metadata/lexer.cpp +else # HAVE_FLEX +# Create target used to stop the build if we want to build the lexer, +# but we don't have the necessary tool to do so +plugins/ctf/common/metadata/lexer.cpp: plugins/ctf/common/metadata/lexer.lpp + @echo "Error: Cannot build target because flex is missing." + @echo "Make sure flex is installed and run the configure script again." + @false + +ALL_LOCAL += plugins/ctf/common/metadata/lexer.cpp +endif # HAVE_FLEX + +all-local: $(ALL_LOCAL) + if ENABLE_PYTHON_COMMON_DEPS noinst_LTLIBRARIES += py-common/libpy-common.la @@ -126,6 +245,35 @@ py_common_libpy_common_la_CPPFLAGS = \ endif # ENABLE_PYTHON_COMMON_DEPS +if ENABLE_DEBUG_INFO +noinst_LTLIBRARIES += plugins/lttng-utils/debug-info/libdebug-info.la + +plugins_lttng_utils_debug_info_libdebug_info_la_SOURCES = \ + plugins/lttng-utils/debug-info/bin-info.c \ + plugins/lttng-utils/debug-info/bin-info.h \ + plugins/lttng-utils/debug-info/crc32.c \ + plugins/lttng-utils/debug-info/crc32.h \ + plugins/lttng-utils/debug-info/debug-info.c \ + plugins/lttng-utils/debug-info/debug-info.h \ + plugins/lttng-utils/debug-info/dwarf.c \ + plugins/lttng-utils/debug-info/dwarf.h \ + plugins/lttng-utils/debug-info/trace-ir-data-copy.c \ + plugins/lttng-utils/debug-info/trace-ir-data-copy.h \ + plugins/lttng-utils/debug-info/trace-ir-mapping.c \ + plugins/lttng-utils/debug-info/trace-ir-mapping.h \ + plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c \ + plugins/lttng-utils/debug-info/trace-ir-metadata-copy.h \ + plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c \ + plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.h \ + plugins/lttng-utils/debug-info/utils.c \ + plugins/lttng-utils/debug-info/utils.h + +plugins_lttng_utils_debug_info_libdebug_info_la_LIBADD = \ + fd-cache/libfd-cache.la + +endif # ENABLE_DEBUG_INFO + + # # Public libraries # @@ -346,3 +494,163 @@ python_plugin_provider_babeltrace2_python_plugin_provider_la_LIBADD += \ lib/libbabeltrace2.la endif endif # ENABLE_PYTHON_PLUGINS + +# +# Plugins +# + +plugindir = "$(BABELTRACE_PLUGINS_DIR)" +plugin_LTLIBRARIES = \ + plugins/ctf/babeltrace-plugin-ctf.la \ + plugins/text/babeltrace-plugin-text.la \ + plugins/utils/babeltrace-plugin-utils.la + + +# utils plugin +plugins_utils_babeltrace_plugin_utils_la_SOURCES = \ + plugins/utils/counter/counter.c \ + plugins/utils/counter/counter.h \ + plugins/utils/dummy/dummy.c \ + plugins/utils/dummy/dummy.h \ + plugins/utils/muxer/muxer.c \ + plugins/utils/muxer/muxer.h \ + plugins/utils/trimmer/trimmer.c \ + plugins/utils/trimmer/trimmer.h \ + plugins/utils/plugin.c + +plugins_utils_babeltrace_plugin_utils_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(LT_NO_UNDEFINED) \ + -avoid-version -module $(LD_NOTEXT) + +plugins_utils_babeltrace_plugin_utils_la_LIBADD = \ + plugins/common/muxing/libmuxing.la + +if !ENABLE_BUILT_IN_PLUGINS +plugins_utils_babeltrace_plugin_utils_la_LIBADD += \ + lib/libbabeltrace2.la \ + common/libbabeltrace2-common.la \ + logging/liblogging.la \ + plugins/common/param-validation/libparam-validation.la +endif + +# ctf plugin +plugins_ctf_babeltrace_plugin_ctf_la_SOURCES = \ + plugins/ctf/common/bfcr/bfcr.cpp \ + plugins/ctf/common/bfcr/bfcr.hpp \ + plugins/ctf/common/msg-iter/msg-iter.cpp \ + plugins/ctf/common/msg-iter/msg-iter.hpp \ + plugins/ctf/common/print.hpp \ + plugins/ctf/fs-sink/fs-sink.cpp \ + plugins/ctf/fs-sink/fs-sink-ctf-meta.hpp \ + plugins/ctf/fs-sink/fs-sink.hpp \ + plugins/ctf/fs-sink/fs-sink-stream.cpp \ + plugins/ctf/fs-sink/fs-sink-stream.hpp \ + plugins/ctf/fs-sink/fs-sink-trace.cpp \ + plugins/ctf/fs-sink/fs-sink-trace.hpp \ + plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.cpp \ + plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.hpp \ + plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.cpp \ + plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.hpp \ + plugins/ctf/fs-src/data-stream-file.cpp \ + plugins/ctf/fs-src/data-stream-file.hpp \ + plugins/ctf/fs-src/file.cpp \ + plugins/ctf/fs-src/file.hpp \ + plugins/ctf/fs-src/fs.cpp \ + plugins/ctf/fs-src/fs.hpp \ + plugins/ctf/fs-src/lttng-index.hpp \ + plugins/ctf/fs-src/metadata.cpp \ + plugins/ctf/fs-src/metadata.hpp \ + plugins/ctf/fs-src/query.cpp \ + plugins/ctf/fs-src/query.hpp \ + plugins/ctf/lttng-live/data-stream.cpp \ + plugins/ctf/lttng-live/data-stream.hpp \ + plugins/ctf/lttng-live/lttng-live.cpp \ + plugins/ctf/lttng-live/lttng-live.hpp \ + plugins/ctf/lttng-live/lttng-viewer-abi.hpp \ + plugins/ctf/lttng-live/metadata.cpp \ + plugins/ctf/lttng-live/metadata.hpp \ + plugins/ctf/lttng-live/viewer-connection.cpp \ + plugins/ctf/lttng-live/viewer-connection.hpp \ + plugins/ctf/plugin.cpp + +plugins_ctf_babeltrace_plugin_ctf_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(LT_NO_UNDEFINED) \ + -avoid-version -module $(LD_NOTEXT) + +plugins_ctf_babeltrace_plugin_ctf_la_LIBADD = \ + plugins/ctf/common/metadata/libctf-parser.la \ + plugins/ctf/common/metadata/libctf-ast.la \ + plugins/common/param-validation/libparam-validation.la + +if BABELTRACE_BUILD_WITH_MINGW +plugins_ctf_babeltrace_plugin_ctf_la_LIBADD += -lws2_32 +endif + +if !ENABLE_BUILT_IN_PLUGINS +plugins_ctf_babeltrace_plugin_ctf_la_LIBADD += \ + lib/libbabeltrace2.la \ + logging/liblogging.la \ + plugins/common/muxing/libmuxing.la \ + common/libbabeltrace2-common.la \ + ctfser/libctfser.la +endif + +# text plugin +plugins_text_babeltrace_plugin_text_la_SOURCES = \ + plugins/text/details/colors.h \ + plugins/text/details/details.c \ + plugins/text/details/details.h \ + plugins/text/details/obj-lifetime-mgmt.c \ + plugins/text/details/obj-lifetime-mgmt.h \ + plugins/text/details/write.c \ + plugins/text/details/write.h \ + plugins/text/dmesg/dmesg.c \ + plugins/text/dmesg/dmesg.h \ + plugins/text/pretty/pretty.c \ + plugins/text/pretty/pretty.h \ + plugins/text/pretty/print.c \ + plugins/text/plugin.c + +plugins_text_babeltrace_plugin_text_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(LT_NO_UNDEFINED) \ + -avoid-version -module $(LD_NOTEXT) + +plugins_text_babeltrace_plugin_text_la_LIBADD = + +if !ENABLE_BUILT_IN_PLUGINS +plugins_text_babeltrace_plugin_text_la_LIBADD += \ + lib/libbabeltrace2.la \ + common/libbabeltrace2-common.la \ + logging/liblogging.la \ + compat/libcompat.la \ + plugins/common/param-validation/libparam-validation.la +endif + +# lttng-utils plugin +if ENABLE_DEBUG_INFO +plugin_LTLIBRARIES += \ + plugins/lttng-utils/babeltrace-plugin-lttng-utils.la + +plugins_lttng_utils_babeltrace_plugin_lttng_utils_la_SOURCES = \ + plugins/lttng-utils/plugin.c + +plugins_lttng_utils_babeltrace_plugin_lttng_utils_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(LT_NO_UNDEFINED) \ + -avoid-version -module $(LD_NOTEXT) \ + $(ELFUTILS_LIBS) + +plugins_lttng_utils_babeltrace_plugin_lttng_utils_la_LIBADD = \ + plugins/lttng-utils/debug-info/libdebug-info.la + +if !ENABLE_BUILT_IN_PLUGINS +plugins_lttng_utils_babeltrace_plugin_lttng_utils_la_LIBADD += \ + lib/libbabeltrace2.la \ + common/libbabeltrace2-common.la \ + logging/liblogging.la \ + plugins/common/param-validation/libparam-validation.la +endif # !ENABLE_BUILT_IN_PLUGINS +endif # ENABLE_DEBUG_INFO diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am deleted file mode 100644 index d8ee190a..00000000 --- a/src/bindings/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: MIT - -if ENABLE_PYTHON_BINDINGS -SUBDIRS = python -endif diff --git a/src/bindings/python/Makefile.am b/src/bindings/python/Makefile.am deleted file mode 100644 index cc6c233b..00000000 --- a/src/bindings/python/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: MIT - -SUBDIRS = bt2 diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am deleted file mode 100644 index c2a0d4c2..00000000 --- a/src/plugins/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: MIT - -SUBDIRS = common utils text ctf - -if ENABLE_DEBUG_INFO -SUBDIRS += lttng-utils -endif diff --git a/src/plugins/common/Makefile.am b/src/plugins/common/Makefile.am deleted file mode 100644 index dab15fe3..00000000 --- a/src/plugins/common/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: MIT - -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/ctf/Makefile.am b/src/plugins/ctf/Makefile.am deleted file mode 100644 index 764962a1..00000000 --- a/src/plugins/ctf/Makefile.am +++ /dev/null @@ -1,69 +0,0 @@ -# SPDX-License-Identifier: MIT - -SUBDIRS = common/metadata - -plugindir = "$(BABELTRACE_PLUGINS_DIR)" -plugin_LTLIBRARIES = babeltrace-plugin-ctf.la - -# ctf plugin -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) \ - $(LT_NO_UNDEFINED) \ - -avoid-version -module $(LD_NOTEXT) - -babeltrace_plugin_ctf_la_LIBADD = \ - 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/liblogging.la \ - $(top_builddir)/src/plugins/common/muxing/libbabeltrace2-plugins-common-muxing.la \ - $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/ctfser/libctfser.la -endif diff --git a/src/plugins/ctf/common/metadata/Makefile.am b/src/plugins/ctf/common/metadata/Makefile.am deleted file mode 100644 index d3b25e23..00000000 --- a/src/plugins/ctf/common/metadata/Makefile.am +++ /dev/null @@ -1,93 +0,0 @@ -# SPDX-License-Identifier: MIT - -AM_CPPFLAGS += -I$(builddir) -I$(srcdir) -AM_YFLAGS = -t -d -v -Wno-yacc - -noinst_LTLIBRARIES = libctf-parser.la libctf-ast.la - -BUILT_SOURCES = parser.hpp - -libctf_parser_la_SOURCES = lexer.lpp parser.ypp objstack.cpp -# scanner-symbols.h is included to prefix generated yy_* symbols -# with bt_. -libctf_parser_la_CPPFLAGS = $(AM_CPPFLAGS) \ - -include $(srcdir)/scanner-symbols.hpp - -# This library contains (mostly) generated code, silence some warnings that it -# produces. -libctf_parser_la_CXXFLAGS = $(AM_CXXFLAGS) \ - -Wno-unused-function \ - -Wno-null-dereference \ - -Wno-missing-field-initializers \ - -Wno-unused-parameter - -libctf_ast_la_SOURCES = \ - visitor-generate-ir.cpp \ - visitor-semantic-validator.cpp \ - visitor-parent-links.cpp \ - ast.hpp \ - objstack.hpp \ - parser.hpp \ - parser-wrap.hpp \ - scanner.hpp \ - scanner-symbols.hpp \ - decoder.cpp \ - decoder.hpp \ - decoder-packetized-file-stream-to-buf.cpp \ - decoder-packetized-file-stream-to-buf.hpp \ - logging.cpp \ - logging.hpp \ - ctf-meta.hpp \ - ctf-meta-visitors.hpp \ - ctf-meta-validate.cpp \ - ctf-meta-update-meanings.cpp \ - ctf-meta-update-in-ir.cpp \ - ctf-meta-update-default-clock-classes.cpp \ - ctf-meta-update-text-array-sequence.cpp \ - ctf-meta-update-alignments.cpp \ - ctf-meta-update-value-storing-indexes.cpp \ - ctf-meta-update-stream-class-config.cpp \ - ctf-meta-warn-meaningless-header-fields.cpp \ - ctf-meta-translate.cpp \ - ctf-meta-resolve.cpp \ - ctf-meta-configure-ir-trace.cpp \ - ctf-meta-configure-ir-trace.hpp - -if BABELTRACE_BUILD_WITH_MINGW -libctf_ast_la_LIBADD = -lintl -liconv -lole32 -endif - -# start with empty files to clean -CLEANFILES = - -if HAVE_BISON -# we have bison: we can clean the generated parser files -CLEANFILES += parser.cpp parser.hpp parser.output -else # HAVE_BISON -# create target used to stop the build if we want to build the parser, -# but we don't have the necessary tool to do so -ERR_MSG = "Error: Cannot build target because bison is missing." -ERR_MSG += "Make sure bison is installed and run the configure script again." - -parser.cpp parser.hpp: parser.ypp - @echo $(ERR_MSG) - @false - -all-local: parser.cpp parser.hpp -endif # HAVE_BISON - -if HAVE_FLEX -# we have flex: we can clean the generated lexer files -CLEANFILES += lexer.cpp -else # HAVE_FLEX -# create target used to stop the build if we want to build the lexer, -# but we don't have the necessary tool to do so -ERR_MSG = "Error: Cannot build target because flex is missing." -ERR_MSG += "Make sure flex is installed and run the configure script again." - -filter-lexer.cpp: lexer.lpp - @echo $(ERR_MSG) - @false - -all-local: lexer.cpp -endif # HAVE_FLEX diff --git a/src/plugins/ctf/common/metadata/lexer.lpp b/src/plugins/ctf/common/metadata/lexer.lpp index 27fea430..2ee0f2db 100644 --- a/src/plugins/ctf/common/metadata/lexer.lpp +++ b/src/plugins/ctf/common/metadata/lexer.lpp @@ -9,13 +9,13 @@ #define BT_LOG_OUTPUT_LEVEL ctf_plugin_metadata_log_level #define BT_LOG_TAG "PLUGIN-CTF-METADATA-LEXER" -#include "logging.hpp" +#include "plugins/ctf/common/metadata/logging.hpp" #include #include -#include "scanner.hpp" -#include "parser-wrap.hpp" -#include "ast.hpp" +#include "plugins/ctf/common/metadata/scanner.hpp" +#include "plugins/ctf/common/metadata/parser-wrap.hpp" +#include "plugins/ctf/common/metadata/ast.hpp" #define YY_FATAL_ERROR(_msg) BT_LOGF_STR(_msg) diff --git a/src/plugins/ctf/common/metadata/parser-wrap.hpp b/src/plugins/ctf/common/metadata/parser-wrap.hpp index d43d391d..e35c3621 100644 --- a/src/plugins/ctf/common/metadata/parser-wrap.hpp +++ b/src/plugins/ctf/common/metadata/parser-wrap.hpp @@ -22,7 +22,7 @@ #endif #define ALLOW_INCLUDE_PARSER_H -#include "parser.hpp" +#include "plugins/ctf/common/metadata/parser.hpp" #undef ALLOW_INCLUDE_PARSER_H #endif diff --git a/src/plugins/ctf/common/metadata/parser.ypp b/src/plugins/ctf/common/metadata/parser.ypp index 55a8c9ef..82dd8ccd 100644 --- a/src/plugins/ctf/common/metadata/parser.ypp +++ b/src/plugins/ctf/common/metadata/parser.ypp @@ -9,7 +9,7 @@ #define BT_LOG_OUTPUT_LEVEL ctf_plugin_metadata_log_level #define BT_LOG_TAG "PLUGIN/CTF/META/PARSER" -#include "logging.hpp" +#include "plugins/ctf/common/metadata/logging.hpp" #include #include @@ -22,11 +22,11 @@ #include #include "common/list.h" #include "common/assert.h" -#include "scanner.hpp" -#include "ast.hpp" -#include "objstack.hpp" +#include "plugins/ctf/common/metadata/scanner.hpp" +#include "plugins/ctf/common/metadata/ast.hpp" +#include "plugins/ctf/common/metadata/objstack.hpp" -#include "parser-wrap.hpp" +#include "plugins/ctf/common/metadata/parser-wrap.hpp" /* * Avoid warning about "yynerrs" being unused, seen with bison 3.5.1 + clang 15 diff --git a/src/plugins/lttng-utils/Makefile.am b/src/plugins/lttng-utils/Makefile.am deleted file mode 100644 index db83d831..00000000 --- a/src/plugins/lttng-utils/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -# SPDX-License-Identifier: MIT - -plugindir = "$(BABELTRACE_PLUGINS_DIR)" -plugin_LTLIBRARIES = babeltrace-plugin-lttng-utils.la - -babeltrace_plugin_lttng_utils_la_SOURCES = \ - plugin.c - -babeltrace_plugin_lttng_utils_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(LT_NO_UNDEFINED) \ - -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/libfd-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 \ - $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/logging/liblogging.la \ - $(top_builddir)/src/plugins/common/param-validation/libbabeltrace2-param-validation.la -endif diff --git a/src/plugins/text/Makefile.am b/src/plugins/text/Makefile.am deleted file mode 100644 index cd772340..00000000 --- a/src/plugins/text/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: MIT - -plugindir = "$(BABELTRACE_PLUGINS_DIR)" -plugin_LTLIBRARIES = babeltrace-plugin-text.la - -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 = - -if !ENABLE_BUILT_IN_PLUGINS -babeltrace_plugin_text_la_LIBADD += \ - $(top_builddir)/src/lib/libbabeltrace2.la \ - $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/logging/liblogging.la \ - $(top_builddir)/src/compat/libcompat.la \ - $(top_builddir)/src/plugins/common/param-validation/libbabeltrace2-param-validation.la -endif diff --git a/src/plugins/utils/Makefile.am b/src/plugins/utils/Makefile.am deleted file mode 100644 index 474f1757..00000000 --- a/src/plugins/utils/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-License-Identifier: MIT - -plugindir = "$(BABELTRACE_PLUGINS_DIR)" -plugin_LTLIBRARIES = babeltrace-plugin-utils.la - -babeltrace_plugin_utils_la_SOURCES = \ - counter/counter.c \ - counter/counter.h \ - dummy/dummy.c \ - dummy/dummy.h \ - muxer/muxer.c \ - muxer/muxer.h \ - trimmer/trimmer.c \ - trimmer/trimmer.h \ - plugin.c - -babeltrace_plugin_utils_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(LT_NO_UNDEFINED) \ - -avoid-version -module $(LD_NOTEXT) - -babeltrace_plugin_utils_la_LIBADD = \ - $(top_builddir)/src/plugins/common/muxing/libbabeltrace2-plugins-common-muxing.la - -if !ENABLE_BUILT_IN_PLUGINS -babeltrace_plugin_utils_la_LIBADD += \ - $(top_builddir)/src/lib/libbabeltrace2.la \ - $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/logging/liblogging.la \ - $(top_builddir)/src/plugins/common/param-validation/libbabeltrace2-param-validation.la -endif diff --git a/tests/param-validation/Makefile.am b/tests/param-validation/Makefile.am index f43a8870..6a1db56d 100644 --- a/tests/param-validation/Makefile.am +++ b/tests/param-validation/Makefile.am @@ -6,7 +6,7 @@ noinst_PROGRAMS = test-param-validation test_param_validation_SOURCES = test-param-validation.c test_param_validation_LDADD = \ $(top_builddir)/src/param-parse/libparam-parse.la \ - $(top_builddir)/src/plugins/common/param-validation/libbabeltrace2-param-validation.la \ + $(top_builddir)/src/plugins/common/param-validation/libparam-validation.la \ $(top_builddir)/src/lib/libbabeltrace2.la \ $(top_builddir)/src/common/libbabeltrace2-common.la \ $(top_builddir)/src/logging/liblogging.la \ -- 2.34.1