From: Michael Jeanson Date: Tue, 24 Oct 2023 19:18:00 +0000 (-0400) Subject: Reduce the number of Makefiles in 'src/' X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=86ef6105d1bdacc0d5e55661df85dfa759c03cba Reduce the number of Makefiles in 'src/' Continue the effort started by Simon to reduce the overall number of Makefiles to allow for faster parallel builds. Change-Id: I3d87dea9979c09d1a6416c7b9950264a8c4d81dc Signed-off-by: Michael Jeanson Reviewed-on: https://review.lttng.org/c/babeltrace/+/11155 Reviewed-by: Philippe Proulx --- diff --git a/configure.ac b/configure.ac index 6d7c53e2..c43d2ac6 100644 --- a/configure.ac +++ b/configure.ac @@ -814,8 +814,6 @@ AC_CONFIG_FILES([ doc/man/Makefile include/Makefile Makefile - src/argpar/Makefile - src/autodisc/Makefile src/babeltrace2-ctf-writer.pc src/babeltrace2.pc src/bindings/Makefile @@ -825,18 +823,6 @@ AC_CONFIG_FILES([ src/bindings/python/Makefile src/cli/Makefile src/common/Makefile - src/cpp-common/Makefile - src/compat/Makefile - src/ctfser/Makefile - src/ctf-writer/Makefile - src/fd-cache/Makefile - src/lib/graph/Makefile - src/lib/graph/message/Makefile - src/lib/Makefile - src/lib/plugin/Makefile - src/lib/prio-heap/Makefile - src/lib/trace-ir/Makefile - src/logging/Makefile src/Makefile src/plugins/common/Makefile src/plugins/ctf/common/metadata/Makefile @@ -845,10 +831,6 @@ AC_CONFIG_FILES([ src/plugins/Makefile src/plugins/text/Makefile src/plugins/utils/Makefile - src/py-common/Makefile - src/python-plugin-provider/Makefile - src/param-parse/Makefile - src/string-format/Makefile tests/bitfield/Makefile tests/ctf-writer/Makefile tests/lib/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 6e01a12d..fdfc93d5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,23 +1,348 @@ # SPDX-License-Identifier: MIT +# Build 'common' first to ensure 'version.h' is generated before any +# compilation. SUBDIRS = \ common \ - py-common \ - cpp-common \ - autodisc \ - argpar \ - ctfser \ - fd-cache \ - compat \ - logging \ - ctf-writer \ - lib \ - string-format \ - python-plugin-provider \ + . \ plugins \ - param-parse \ cli \ bindings +noinst_HEADERS = \ + cpp-common/bt2/clock-class.hpp \ + cpp-common/bt2/clock-snapshot.hpp \ + cpp-common/bt2/common-iter.hpp \ + cpp-common/bt2/exc.hpp \ + cpp-common/bt2/field-class.hpp \ + cpp-common/bt2/field.hpp \ + cpp-common/bt2/field-path.hpp \ + cpp-common/bt2/integer-range.hpp \ + cpp-common/bt2/integer-range-set.hpp \ + cpp-common/bt2/internal/borrowed-obj.hpp \ + cpp-common/bt2/internal/shared-obj.hpp \ + cpp-common/bt2/internal/utils.hpp \ + cpp-common/bt2/logging.hpp \ + cpp-common/bt2/message.hpp \ + cpp-common/bt2/trace-ir.hpp \ + cpp-common/bt2/type-traits.hpp \ + cpp-common/bt2/value.hpp \ + cpp-common/align.hpp \ + cpp-common/cfg-error-reporting.hpp \ + cpp-common/cfg-error-reporting-throw.hpp \ + cpp-common/cfg-logging-error-reporting.hpp \ + cpp-common/cfg-logging-error-reporting-throw.hpp \ + cpp-common/cfg-logging.hpp \ + cpp-common/endian.hpp \ + cpp-common/exc.hpp \ + cpp-common/glib-up.hpp \ + cpp-common/libc-up.hpp \ + cpp-common/lib-str.hpp \ + cpp-common/log-cfg.hpp \ + cpp-common/make-unique.hpp \ + cpp-common/nlohmann/json.hpp \ + cpp-common/optional.hpp \ + cpp-common/read-fixed-len-int.hpp \ + cpp-common/safe-ops.hpp \ + cpp-common/std-int.hpp \ + cpp-common/string_view.hpp \ + cpp-common/uuid.hpp \ + cpp-common/uuid-view.hpp \ + cpp-common/vector.hpp + +# +# Convenience libraries +# + +noinst_LTLIBRARIES = \ + argpar/libargpar.la \ + autodisc/libautodisc.la \ + compat/libcompat.la \ + ctfser/libctfser.la \ + fd-cache/libfd-cache.la \ + logging/liblogging.la \ + param-parse/libparam-parse.la \ + string-format/libstring-format.la + +argpar_libargpar_la_SOURCES = \ + argpar/argpar.c \ + argpar/argpar.h + +autodisc_libautodisc_la_SOURCES = \ + autodisc/autodisc.c \ + autodisc/autodisc.h + +compat_libcompat_la_SOURCES = \ + compat/bitfield.h \ + compat/compiler.h \ + compat/endian.h \ + compat/fcntl.h \ + compat/glib.h \ + compat/limits.h \ + compat/memstream.h \ + compat/mman.c \ + compat/mman.h \ + compat/socket.h \ + compat/stdio.h \ + compat/stdlib.h \ + compat/string.h \ + compat/time.h \ + compat/unistd.h \ + compat/utc.h + +ctfser_libctfser_la_SOURCES = \ + ctfser/ctfser.c \ + ctfser/ctfser.h + +fd_cache_libfd_cache_la_SOURCES = \ + fd-cache/fd-cache.c \ + fd-cache/fd-cache.h + +logging_liblogging_la_SOURCES = \ + logging/comp-logging.h \ + logging/log.c \ + logging/log.h + +param_parse_libparam_parse_la_SOURCES = \ + param-parse/param-parse.c \ + param-parse/param-parse.h + +string_format_libstring_format_la_SOURCES = \ + string-format/format-plugin-comp-cls-name.c \ + string-format/format-plugin-comp-cls-name.h \ + string-format/format-error.c \ + string-format/format-error.h + +if ENABLE_PYTHON_COMMON_DEPS +noinst_LTLIBRARIES += py-common/libpy-common.la + +py_common_libpy_common_la_SOURCES = \ + py-common/py-common.c \ + py-common/py-common.h + +py_common_libpy_common_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + $(PYTHON_INCLUDE) + +endif # ENABLE_PYTHON_COMMON_DEPS + +# +# Public libraries +# + +lib_LTLIBRARIES = \ + ctf-writer/libbabeltrace2-ctf-writer.la \ + lib/libbabeltrace2.la + +lib_libbabeltrace2_la_SOURCES = \ + lib/graph/message/discarded-items.c \ + lib/graph/message/discarded-items.h \ + lib/graph/message/event.c \ + lib/graph/message/event.h \ + lib/graph/message-iterator-class.c \ + lib/graph/message-iterator-class.h \ + lib/graph/message/iterator.h \ + lib/graph/message/message.c \ + lib/graph/message/message.h \ + lib/graph/message/message-iterator-inactivity.c \ + lib/graph/message/message-iterator-inactivity.h \ + lib/graph/message/packet.c \ + lib/graph/message/packet.h \ + lib/graph/message/stream.c \ + lib/graph/message/stream.h \ + lib/graph/component.c \ + lib/graph/component-class.c \ + lib/graph/component-class.h \ + lib/graph/component-class-sink-simple.c \ + lib/graph/component-class-sink-simple.h \ + lib/graph/component-descriptor-set.c \ + lib/graph/component-descriptor-set.h \ + lib/graph/component-filter.c \ + lib/graph/component-filter.h \ + lib/graph/component.h \ + lib/graph/component-sink.c \ + lib/graph/component-sink.h \ + lib/graph/component-source.c \ + lib/graph/component-source.h \ + lib/graph/connection.c \ + lib/graph/connection.h \ + lib/graph/graph.c \ + lib/graph/graph.h \ + lib/graph/interrupter.c \ + lib/graph/interrupter.h \ + lib/graph/iterator.c \ + lib/graph/mip.c \ + lib/graph/port.c \ + lib/graph/port.h \ + lib/graph/query-executor.c \ + lib/graph/query-executor.h \ + lib/plugin/plugin.c \ + lib/plugin/plugin.h \ + lib/plugin/plugin-so.c \ + lib/plugin/plugin-so.h \ + lib/prio-heap/prio-heap.c \ + lib/prio-heap/prio-heap.h \ + lib/trace-ir/attributes.c \ + lib/trace-ir/attributes.h \ + lib/trace-ir/clock-class.c \ + lib/trace-ir/clock-class.h \ + lib/trace-ir/clock-snapshot.c \ + lib/trace-ir/clock-snapshot.h \ + lib/trace-ir/event.c \ + lib/trace-ir/event-class.c \ + lib/trace-ir/event-class.h \ + lib/trace-ir/event.h \ + lib/trace-ir/field.c \ + lib/trace-ir/field-class.c \ + lib/trace-ir/field-class.h \ + lib/trace-ir/field.h \ + lib/trace-ir/field-path.c \ + lib/trace-ir/field-path.h \ + lib/trace-ir/field-wrapper.c \ + lib/trace-ir/field-wrapper.h \ + lib/trace-ir/packet.c \ + lib/trace-ir/packet.h \ + lib/trace-ir/resolve-field-path.c \ + lib/trace-ir/resolve-field-path.h \ + lib/trace-ir/stream.c \ + lib/trace-ir/stream-class.c \ + lib/trace-ir/stream-class.h \ + lib/trace-ir/stream.h \ + lib/trace-ir/trace.c \ + lib/trace-ir/trace-class.c \ + lib/trace-ir/trace-class.h \ + lib/trace-ir/trace.h \ + lib/trace-ir/utils.c \ + lib/trace-ir/utils.h \ + lib/assert-cond-base.h \ + lib/assert-cond.h \ + lib/assert-cond.c \ + lib/babeltrace2.c \ + lib/current-thread.c \ + lib/error.c \ + lib/error.h \ + lib/func-status.h \ + lib/integer-range-set.c \ + lib/integer-range-set.h \ + lib/lib-logging.c \ + lib/logging.c \ + lib/logging.h \ + lib/object-pool.c \ + lib/object-pool.h \ + lib/object.h \ + lib/property.h \ + lib/util.c \ + lib/value.c \ + lib/value.h + +lib_libbabeltrace2_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(LT_NO_UNDEFINED) \ + -version-info $(BABELTRACE_LIBRARY_VERSION) + +lib_libbabeltrace2_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + '-DBABELTRACE_PLUGIN_PROVIDERS_DIR="$(BABELTRACE_PLUGIN_PROVIDERS_DIR)"' + +lib_libbabeltrace2_la_LIBADD = \ + logging/liblogging.la \ + common/libbabeltrace2-common.la \ + compat/libcompat.la + +ctf_writer_libbabeltrace2_ctf_writer_la_SOURCES = \ + ctf-writer/assert-pre.h \ + ctf-writer/attributes.c \ + ctf-writer/attributes.h \ + ctf-writer/clock.c \ + ctf-writer/clock-class.c \ + ctf-writer/clock-class.h \ + ctf-writer/clock.h \ + ctf-writer/event.c \ + ctf-writer/event-class.c \ + ctf-writer/event-class.h \ + ctf-writer/event.h \ + ctf-writer/field-path.c \ + ctf-writer/field-path.h \ + ctf-writer/fields.c \ + ctf-writer/fields.h \ + ctf-writer/field-types.c \ + ctf-writer/field-types.h \ + ctf-writer/field-wrapper.c \ + ctf-writer/field-wrapper.h \ + ctf-writer/functor.c \ + ctf-writer/functor.h \ + ctf-writer/logging.c \ + ctf-writer/logging.h \ + ctf-writer/object.c \ + ctf-writer/object.h \ + ctf-writer/object-pool.c \ + ctf-writer/object-pool.h \ + ctf-writer/resolve.c \ + ctf-writer/resolve.h \ + ctf-writer/stream.c \ + ctf-writer/stream-class.c \ + ctf-writer/stream-class.h \ + ctf-writer/stream.h \ + ctf-writer/trace.c \ + ctf-writer/trace.h \ + ctf-writer/utils.c \ + ctf-writer/utils.h \ + ctf-writer/validation.c \ + ctf-writer/validation.h \ + ctf-writer/values.c \ + ctf-writer/values.h \ + ctf-writer/visitor.c \ + ctf-writer/visitor.h \ + ctf-writer/writer.c \ + ctf-writer/writer.h + +ctf_writer_libbabeltrace2_ctf_writer_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(LT_NO_UNDEFINED) \ + -version-info $(BABELTRACE_LIBRARY_VERSION) + +ctf_writer_libbabeltrace2_ctf_writer_la_LIBADD = \ + logging/liblogging.la \ + common/libbabeltrace2-common.la \ + ctfser/libctfser.la \ + compat/libcompat.la + pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = babeltrace2.pc babeltrace2-ctf-writer.pc +pkgconfig_DATA = \ + babeltrace2-ctf-writer.pc \ + babeltrace2.pc + +# +# Python plugin provider +# + +if ENABLE_PYTHON_PLUGINS +pluginproviderdir = "$(BABELTRACE_PLUGIN_PROVIDERS_DIR)" +pluginprovider_LTLIBRARIES = python-plugin-provider/babeltrace2-python-plugin-provider.la + +python_plugin_provider_babeltrace2_python_plugin_provider_la_SOURCES = \ + python-plugin-provider/python-plugin-provider.c \ + python-plugin-provider/python-plugin-provider.h + +python_plugin_provider_babeltrace2_python_plugin_provider_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(LT_NO_UNDEFINED) \ + -avoid-version -module \ + $(PYTHON_LDFLAGS) + +python_plugin_provider_babeltrace2_python_plugin_provider_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + $(PYTHON_INCLUDE) + +python_plugin_provider_babeltrace2_python_plugin_provider_la_LIBADD = + +# Link the Python plugin provider library with libbabeltrace2 +# when it's not built-in the babeltrace2 executable. +if !ENABLE_BUILT_IN_PLUGINS +python_plugin_provider_babeltrace2_python_plugin_provider_la_LIBADD += \ + logging/liblogging.la \ + common/libbabeltrace2-common.la \ + py-common/libpy-common.la \ + lib/libbabeltrace2.la +endif +endif # ENABLE_PYTHON_PLUGINS diff --git a/src/argpar/Makefile.am b/src/argpar/Makefile.am deleted file mode 100644 index 385d19b5..00000000 --- a/src/argpar/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: MIT - -noinst_LTLIBRARIES = libargpar.la - -libargpar_la_SOURCES = argpar.c argpar.h diff --git a/src/autodisc/Makefile.am b/src/autodisc/Makefile.am deleted file mode 100644 index addff745..00000000 --- a/src/autodisc/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: MIT - -noinst_LTLIBRARIES = libbabeltrace2-autodisc.la - -libbabeltrace2_autodisc_la_SOURCES = \ - autodisc.c \ - autodisc.h diff --git a/src/bindings/python/bt2/Makefile.am b/src/bindings/python/bt2/Makefile.am index fee33134..e427ef61 100644 --- a/src/bindings/python/bt2/Makefile.am +++ b/src/bindings/python/bt2/Makefile.am @@ -94,11 +94,11 @@ STATIC_BINDINGS_DEPS = \ # Convenience static libraries on which the Python bindings library depends. # These are listed in the setup.py(.in) file. STATIC_LIBRARIES_DEPS = \ - $(top_builddir)/src/autodisc/libbabeltrace2-autodisc.la \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la \ + $(top_builddir)/src/autodisc/libautodisc.la \ + $(top_builddir)/src/logging/liblogging.la \ $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/py-common/libbabeltrace2-py-common.la \ - $(top_builddir)/src/string-format/libbabeltrace2-string-format.la + $(top_builddir)/src/py-common/libpy-common.la \ + $(top_builddir)/src/string-format/libstring-format.la GENERATED_BINDINGS_DEPS = \ bt2/native_bt.c \ diff --git a/src/bindings/python/bt2/setup.py.in b/src/bindings/python/bt2/setup.py.in index d9c0bf33..0947521e 100644 --- a/src/bindings/python/bt2/setup.py.in +++ b/src/bindings/python/bt2/setup.py.in @@ -119,11 +119,11 @@ def main(): sources=["bt2/native_bt.c", "@srcdir@/bt2/logging.c"], libraries=["babeltrace2", "glib-2.0"], extra_objects=[ - "@top_builddir@/src/autodisc/.libs/libbabeltrace2-autodisc.a", - "@top_builddir@/src/logging/.libs/libbabeltrace2-logging.a", + "@top_builddir@/src/autodisc/.libs/libautodisc.a", + "@top_builddir@/src/logging/.libs/liblogging.a", "@top_builddir@/src/common/.libs/libbabeltrace2-common.a", - "@top_builddir@/src/py-common/.libs/libbabeltrace2-py-common.a", - "@top_builddir@/src/string-format/.libs/libbabeltrace2-string-format.a", + "@top_builddir@/src/py-common/.libs/libpy-common.a", + "@top_builddir@/src/string-format/.libs/libstring-format.a", ], ) diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am index 29a6478e..ce4f246c 100644 --- a/src/cli/Makefile.am +++ b/src/cli/Makefile.am @@ -57,14 +57,14 @@ EXTRA_babeltrace2_bin_DEPENDENCIES = # directly). babeltrace2_bin_LDADD = \ $(top_builddir)/src/argpar/libargpar.la \ - $(top_builddir)/src/autodisc/libbabeltrace2-autodisc.la \ - $(top_builddir)/src/param-parse/libbabeltrace2-param-parse.la \ - $(top_builddir)/src/string-format/libbabeltrace2-string-format.la \ + $(top_builddir)/src/autodisc/libautodisc.la \ + $(top_builddir)/src/param-parse/libparam-parse.la \ + $(top_builddir)/src/string-format/libstring-format.la \ $(top_builddir)/src/lib/libbabeltrace2.la \ $(top_builddir)/src/compat/libcompat.la \ $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la \ - $(top_builddir)/src/ctfser/libbabeltrace2-ctfser.la + $(top_builddir)/src/logging/liblogging.la \ + $(top_builddir)/src/ctfser/libctfser.la if ENABLE_BUILT_IN_PLUGINS # Takes a plugin name and outputs the needed LDFLAGS to embed it. diff --git a/src/compat/Makefile.am b/src/compat/Makefile.am deleted file mode 100644 index c857372a..00000000 --- a/src/compat/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: MIT - -noinst_LTLIBRARIES = libcompat.la - -libcompat_la_SOURCES = \ - mman.c \ - mman.h - -libcompat_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(LD_NO_AS_NEEDED) - -noinst_HEADERS = \ - bitfield.h \ - compiler.h \ - endian.h \ - fcntl.h \ - glib.h \ - limits.h \ - memstream.h \ - socket.h \ - stdio.h \ - stdlib.h \ - string.h \ - time.h \ - unistd.h \ - utc.h diff --git a/src/cpp-common/Makefile.am b/src/cpp-common/Makefile.am deleted file mode 100644 index 13f31e73..00000000 --- a/src/cpp-common/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: MIT - -EXTRA_DIST = bt2 \ - cfg-error-reporting-throw.hpp \ - cfg-error-reporting.hpp \ - cfg-logging-error-reporting-throw.hpp \ - cfg-logging-error-reporting.hpp \ - cfg-logging.hpp \ - exc.hpp \ - log-cfg.hpp \ - lib-str.hpp \ - nlohmann/json.hpp \ - optional.hpp \ - string_view.hpp \ - uuid-view.hpp \ - endian.hpp \ - make-unique.hpp \ - safe-ops.hpp \ - align.hpp \ - uuid.hpp \ - vector.hpp \ - std-int.hpp \ - read-fixed-len-int.hpp \ - glib-up.hpp \ - libc-up.hpp diff --git a/src/ctf-writer/Makefile.am b/src/ctf-writer/Makefile.am deleted file mode 100644 index 2e979b01..00000000 --- a/src/ctf-writer/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -# SPDX-License-Identifier: MIT - -lib_LTLIBRARIES = libbabeltrace2-ctf-writer.la - -libbabeltrace2_ctf_writer_la_SOURCES = \ - assert-pre.h \ - attributes.c \ - attributes.h \ - clock.c \ - clock-class.c \ - clock-class.h \ - clock.h \ - event.c \ - event-class.c \ - event-class.h \ - event.h \ - field-path.c \ - field-path.h \ - fields.c \ - fields.h \ - field-types.c \ - field-types.h \ - field-wrapper.c \ - field-wrapper.h \ - functor.c \ - functor.h \ - logging.c \ - logging.h \ - object.c \ - object.h \ - object-pool.c \ - object-pool.h \ - resolve.c \ - resolve.h \ - stream.c \ - stream-class.c \ - stream-class.h \ - stream.h \ - trace.c \ - trace.h \ - utils.c \ - utils.h \ - validation.c \ - validation.h \ - values.c \ - values.h \ - visitor.c \ - visitor.h \ - writer.c \ - writer.h - -libbabeltrace2_ctf_writer_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(LT_NO_UNDEFINED) \ - -version-info $(BABELTRACE_LIBRARY_VERSION) - -libbabeltrace2_ctf_writer_la_LIBADD = \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la \ - $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/ctfser/libbabeltrace2-ctfser.la \ - $(top_builddir)/src/compat/libcompat.la diff --git a/src/ctfser/Makefile.am b/src/ctfser/Makefile.am deleted file mode 100644 index 19c96f12..00000000 --- a/src/ctfser/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: MIT - -noinst_LTLIBRARIES = libbabeltrace2-ctfser.la - -libbabeltrace2_ctfser_la_SOURCES = \ - ctfser.c \ - ctfser.h diff --git a/src/fd-cache/Makefile.am b/src/fd-cache/Makefile.am deleted file mode 100644 index d3c32518..00000000 --- a/src/fd-cache/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: MIT - -noinst_LTLIBRARIES = libbabeltrace2-fd-cache.la - -libbabeltrace2_fd_cache_la_SOURCES = \ - fd-cache.c \ - fd-cache.h diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am deleted file mode 100644 index a9113810..00000000 --- a/src/lib/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -# SPDX-License-Identifier: MIT - -SUBDIRS = trace-ir prio-heap plugin graph - -lib_LTLIBRARIES = libbabeltrace2.la - -libbabeltrace2_la_SOURCES = \ - assert-cond-base.h \ - assert-cond.h \ - assert-cond.c \ - babeltrace2.c \ - current-thread.c \ - error.c \ - error.h \ - func-status.h \ - integer-range-set.c \ - integer-range-set.h \ - lib-logging.c \ - logging.c \ - logging.h \ - object-pool.c \ - object-pool.h \ - object.h \ - property.h \ - util.c \ - value.c \ - value.h - -libbabeltrace2_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(LT_NO_UNDEFINED) \ - -version-info $(BABELTRACE_LIBRARY_VERSION) - -libbabeltrace2_la_LIBADD = \ - prio-heap/libprio-heap.la \ - graph/libgraph.la \ - plugin/libplugin.la \ - trace-ir/libtrace-ir.la \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la \ - $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/compat/libcompat.la - -if ENABLE_BUILT_IN_PYTHON_PLUGIN_SUPPORT -libbabeltrace2_la_LIBADD += $(top_builddir)/src/python-plugin-provider/babeltrace2-python-plugin-provider.la -endif diff --git a/src/lib/graph/Makefile.am b/src/lib/graph/Makefile.am deleted file mode 100644 index 69b0531f..00000000 --- a/src/lib/graph/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-License-Identifier: MIT - -SUBDIRS = message - -noinst_LTLIBRARIES = libgraph.la - -# Graph library -libgraph_la_SOURCES = \ - component-class-sink-simple.c \ - component-class-sink-simple.h \ - component-class.c \ - component-class.h \ - component-descriptor-set.c \ - component-descriptor-set.h \ - component-filter.c \ - component-filter.h \ - component-sink.c \ - component-sink.h \ - component-source.c \ - component-source.h \ - component.c \ - component.h \ - connection.c \ - connection.h \ - graph.c \ - graph.h \ - interrupter.c \ - interrupter.h \ - iterator.c \ - message-iterator-class.c \ - message-iterator-class.h \ - mip.c \ - port.c \ - port.h \ - query-executor.c \ - query-executor.h - -libgraph_la_LIBADD = \ - message/libgraph-message.la diff --git a/src/lib/graph/message/Makefile.am b/src/lib/graph/message/Makefile.am deleted file mode 100644 index c34530b1..00000000 --- a/src/lib/graph/message/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: MIT - -noinst_LTLIBRARIES = libgraph-message.la - -libgraph_message_la_SOURCES = \ - discarded-items.c \ - discarded-items.h \ - event.c \ - event.h \ - iterator.h \ - message.c \ - message.h \ - message-iterator-inactivity.c \ - message-iterator-inactivity.h \ - packet.c \ - packet.h \ - stream.c \ - stream.h diff --git a/src/lib/plugin/Makefile.am b/src/lib/plugin/Makefile.am deleted file mode 100644 index e25fd70e..00000000 --- a/src/lib/plugin/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: MIT - -AM_CPPFLAGS += '-DBABELTRACE_PLUGIN_PROVIDERS_DIR="$(BABELTRACE_PLUGIN_PROVIDERS_DIR)"' - -noinst_LTLIBRARIES = libplugin.la - -# Plug-in system library -libplugin_la_SOURCES = \ - plugin.c \ - plugin.h \ - plugin-so.c \ - plugin-so.h diff --git a/src/lib/prio-heap/Makefile.am b/src/lib/prio-heap/Makefile.am deleted file mode 100644 index 5a2652c7..00000000 --- a/src/lib/prio-heap/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: MIT - -noinst_LTLIBRARIES = libprio-heap.la - -libprio_heap_la_SOURCES = \ - prio-heap.c \ - prio-heap.h diff --git a/src/lib/trace-ir/Makefile.am b/src/lib/trace-ir/Makefile.am deleted file mode 100644 index 1a79d069..00000000 --- a/src/lib/trace-ir/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-License-Identifier: MIT - -noinst_LTLIBRARIES = libtrace-ir.la - -libtrace_ir_la_SOURCES = \ - attributes.c \ - attributes.h \ - clock-class.c \ - clock-class.h \ - clock-snapshot.c \ - clock-snapshot.h \ - event.c \ - event-class.c \ - event-class.h \ - event.h \ - field.c \ - field-class.c \ - field-class.h \ - field.h \ - field-path.c \ - field-path.h \ - field-wrapper.c \ - field-wrapper.h \ - packet.c \ - packet.h \ - resolve-field-path.c \ - resolve-field-path.h \ - stream.c \ - stream-class.c \ - stream-class.h \ - stream.h \ - trace.c \ - trace-class.c \ - trace-class.h \ - trace.h \ - utils.c \ - utils.h diff --git a/src/logging/Makefile.am b/src/logging/Makefile.am deleted file mode 100644 index dd45f6dc..00000000 --- a/src/logging/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: MIT - -noinst_LTLIBRARIES = libbabeltrace2-logging.la - -libbabeltrace2_logging_la_SOURCES = log.c log.h comp-logging.h diff --git a/src/param-parse/Makefile.am b/src/param-parse/Makefile.am deleted file mode 100644 index 4c2479eb..00000000 --- a/src/param-parse/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: MIT - -noinst_LTLIBRARIES = libbabeltrace2-param-parse.la - -libbabeltrace2_param_parse_la_SOURCES = \ - param-parse.c \ - param-parse.h diff --git a/src/plugins/ctf/Makefile.am b/src/plugins/ctf/Makefile.am index 78e75af7..764962a1 100644 --- a/src/plugins/ctf/Makefile.am +++ b/src/plugins/ctf/Makefile.am @@ -62,8 +62,8 @@ 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/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/libbabeltrace2-ctfser.la + $(top_builddir)/src/ctfser/libctfser.la endif diff --git a/src/plugins/lttng-utils/Makefile.am b/src/plugins/lttng-utils/Makefile.am index ab724777..db83d831 100644 --- a/src/plugins/lttng-utils/Makefile.am +++ b/src/plugins/lttng-utils/Makefile.am @@ -38,7 +38,7 @@ debug_info_libdebug_info_la_SOURCES = \ debug-info/utils.h debug_info_libdebug_info_la_LIBADD = \ - $(top_builddir)/src/fd-cache/libbabeltrace2-fd-cache.la + $(top_builddir)/src/fd-cache/libfd-cache.la babeltrace_plugin_lttng_utils_la_LIBADD += \ debug-info/libdebug-info.la @@ -48,6 +48,6 @@ 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/libbabeltrace2-logging.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 index 5d136ad3..cd772340 100644 --- a/src/plugins/text/Makefile.am +++ b/src/plugins/text/Makefile.am @@ -29,7 +29,7 @@ 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/libbabeltrace2-logging.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 index 44010153..474f1757 100644 --- a/src/plugins/utils/Makefile.am +++ b/src/plugins/utils/Makefile.am @@ -26,6 +26,6 @@ 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/libbabeltrace2-logging.la \ + $(top_builddir)/src/logging/liblogging.la \ $(top_builddir)/src/plugins/common/param-validation/libbabeltrace2-param-validation.la endif diff --git a/src/py-common/Makefile.am b/src/py-common/Makefile.am deleted file mode 100644 index 219ec20f..00000000 --- a/src/py-common/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: MIT - -if ENABLE_PYTHON_COMMON_DEPS -AM_CPPFLAGS += $(PYTHON_INCLUDE) - -noinst_LTLIBRARIES = libbabeltrace2-py-common.la - -libbabeltrace2_py_common_la_SOURCES = \ - py-common.c \ - py-common.h -endif # ENABLE_PYTHON_COMMON_DEPS diff --git a/src/python-plugin-provider/Makefile.am b/src/python-plugin-provider/Makefile.am deleted file mode 100644 index 3d3a11fe..00000000 --- a/src/python-plugin-provider/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: MIT - -if ENABLE_PYTHON_PLUGINS -AM_CPPFLAGS += $(PYTHON_INCLUDE) - -pluginproviderdir = "$(BABELTRACE_PLUGIN_PROVIDERS_DIR)" -pluginprovider_LTLIBRARIES = babeltrace2-python-plugin-provider.la - -babeltrace2_python_plugin_provider_la_SOURCES = \ - python-plugin-provider.c \ - python-plugin-provider.h - -babeltrace2_python_plugin_provider_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(LT_NO_UNDEFINED) \ - -avoid-version -module \ - $(PYTHON_LDFLAGS) - -babeltrace2_python_plugin_provider_la_LIBADD = - -# Link the Python plugin provider library with libbabeltrace2 -# when it's not built-in the babeltrace2 executable. -if !ENABLE_BUILT_IN_PLUGINS -babeltrace2_python_plugin_provider_la_LIBADD += \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la \ - $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/py-common/libbabeltrace2-py-common.la \ - $(top_builddir)/src/lib/libbabeltrace2.la -endif -endif # ENABLE_PYTHON_PLUGINS diff --git a/src/string-format/Makefile.am b/src/string-format/Makefile.am deleted file mode 100644 index 4049ba99..00000000 --- a/src/string-format/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: MIT - -noinst_LTLIBRARIES = libbabeltrace2-string-format.la - -libbabeltrace2_string_format_la_SOURCES = \ - format-plugin-comp-cls-name.c \ - format-plugin-comp-cls-name.h \ - format-error.c \ - format-error.h diff --git a/tests/ctf-writer/Makefile.am b/tests/ctf-writer/Makefile.am index eb4f1124..c6c3ebab 100644 --- a/tests/ctf-writer/Makefile.am +++ b/tests/ctf-writer/Makefile.am @@ -10,7 +10,7 @@ ctf_writer_LDADD = \ $(top_builddir)/tests/utils/libtestcommon.la \ $(top_builddir)/src/ctf-writer/libbabeltrace2-ctf-writer.la \ $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la + $(top_builddir)/src/logging/liblogging.la dist_check_SCRIPTS = test_ctf_writer diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 488429fa..903d9a2d 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -9,7 +9,7 @@ COMMON_TEST_LDADD = \ $(top_builddir)/tests/utils/libtestcommon.la \ $(top_builddir)/tests/lib/utils/liblib-utils.la \ $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la + $(top_builddir)/src/logging/liblogging.la test_bt_values_LDADD = $(COMMON_TEST_LDADD) \ $(top_builddir)/src/lib/libbabeltrace2.la diff --git a/tests/lib/conds/Makefile.am b/tests/lib/conds/Makefile.am index b6afa6c9..a3934fe2 100644 --- a/tests/lib/conds/Makefile.am +++ b/tests/lib/conds/Makefile.am @@ -9,7 +9,7 @@ conds_triggers_SOURCES = \ conds_triggers_LDADD = \ $(top_builddir)/tests/lib/utils/liblib-utils.la \ $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la \ + $(top_builddir)/src/logging/liblogging.la \ $(top_builddir)/src/lib/libbabeltrace2.la noinst_PROGRAMS = conds-triggers diff --git a/tests/lib/test-plugin-plugins/Makefile.am b/tests/lib/test-plugin-plugins/Makefile.am index 4725a564..1b52cafb 100644 --- a/tests/lib/test-plugin-plugins/Makefile.am +++ b/tests/lib/test-plugin-plugins/Makefile.am @@ -11,7 +11,7 @@ plugin_minimal_la_LDFLAGS = \ plugin_minimal_la_LIBADD = \ $(top_builddir)/src/lib/libbabeltrace2.la \ $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la + $(top_builddir)/src/logging/liblogging.la # source/filter/sink plugin plugin_sfs_la_SOURCES = sfs.c @@ -22,4 +22,4 @@ plugin_sfs_la_LDFLAGS = \ plugin_sfs_la_LIBADD = \ $(top_builddir)/src/lib/libbabeltrace2.la \ $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la + $(top_builddir)/src/logging/liblogging.la diff --git a/tests/param-validation/Makefile.am b/tests/param-validation/Makefile.am index e33f986f..5d6419c1 100644 --- a/tests/param-validation/Makefile.am +++ b/tests/param-validation/Makefile.am @@ -5,9 +5,9 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils noinst_PROGRAMS = test_param_validation test_param_validation_SOURCES = test_param_validation.c test_param_validation_LDADD = \ - $(top_builddir)/src/param-parse/libbabeltrace2-param-parse.la \ + $(top_builddir)/src/param-parse/libparam-parse.la \ $(top_builddir)/src/plugins/common/param-validation/libbabeltrace2-param-validation.la \ $(top_builddir)/src/lib/libbabeltrace2.la \ $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la \ + $(top_builddir)/src/logging/liblogging.la \ $(top_builddir)/tests/utils/tap/libtap.la diff --git a/tests/plugins/flt.lttng-utils.debug-info/Makefile.am b/tests/plugins/flt.lttng-utils.debug-info/Makefile.am index 1a1cefc7..94310191 100644 --- a/tests/plugins/flt.lttng-utils.debug-info/Makefile.am +++ b/tests/plugins/flt.lttng-utils.debug-info/Makefile.am @@ -26,8 +26,8 @@ noinst_PROGRAMS += test_dwarf test_bin_info test_dwarf_LDADD = \ $(top_builddir)/src/plugins/lttng-utils/debug-info/libdebug-info.la \ - $(top_builddir)/src/fd-cache/libbabeltrace2-fd-cache.la \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la \ + $(top_builddir)/src/fd-cache/libfd-cache.la \ + $(top_builddir)/src/logging/liblogging.la \ $(top_builddir)/src/common/libbabeltrace2-common.la \ $(ELFUTILS_LIBS) \ $(LIBTAP) @@ -35,8 +35,8 @@ test_dwarf_SOURCES = test_dwarf.c test_bin_info_LDADD = \ $(top_builddir)/src/plugins/lttng-utils/debug-info/libdebug-info.la \ - $(top_builddir)/src/fd-cache/libbabeltrace2-fd-cache.la \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la \ + $(top_builddir)/src/fd-cache/libfd-cache.la \ + $(top_builddir)/src/logging/liblogging.la \ $(top_builddir)/src/common/libbabeltrace2-common.la \ $(top_builddir)/src/lib/libbabeltrace2.la \ $(ELFUTILS_LIBS) \ diff --git a/tests/plugins/sink.ctf.fs/succeed/Makefile.am b/tests/plugins/sink.ctf.fs/succeed/Makefile.am index 1f7d46cf..f8974f62 100644 --- a/tests/plugins/sink.ctf.fs/succeed/Makefile.am +++ b/tests/plugins/sink.ctf.fs/succeed/Makefile.am @@ -6,7 +6,7 @@ dist_check_SCRIPTS = test_succeed GEN_TRACE_LDADD = \ $(top_builddir)/src/ctf-writer/libbabeltrace2-ctf-writer.la \ $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la + $(top_builddir)/src/logging/liblogging.la gen_trace_float_SOURCES = gen-trace-float.c gen_trace_float_LDADD = $(GEN_TRACE_LDADD) diff --git a/tests/plugins/src.ctf.fs/succeed/Makefile.am b/tests/plugins/src.ctf.fs/succeed/Makefile.am index 2cfbe2d9..906dc7a6 100644 --- a/tests/plugins/src.ctf.fs/succeed/Makefile.am +++ b/tests/plugins/src.ctf.fs/succeed/Makefile.am @@ -6,7 +6,7 @@ dist_check_SCRIPTS = test_succeed GEN_TRACE_LDADD = \ $(top_builddir)/src/ctf-writer/libbabeltrace2-ctf-writer.la \ $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la + $(top_builddir)/src/logging/liblogging.la gen_trace_simple_SOURCES = gen-trace-simple.c gen_trace_simple_LDADD = $(GEN_TRACE_LDADD)