src: Makefile.am cleanups

[babeltrace.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index cf31568797f682fbeba356898e7fac6fe31e14ec..a2b3aa0a630d354cbf96723111d84756b2f26a58 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,9 +29,10 @@ noinst_HEADERS = \
        cpp-common/bt2/message-array.hpp \
        cpp-common/bt2/message-iterator.hpp \
        cpp-common/bt2/message.hpp \
-       cpp-common/bt2/shared-object.hpp \
-       cpp-common/bt2/raw-value-proxy.hpp \
+       cpp-common/bt2/optional-borrowed-object.hpp \
+       cpp-common/bt2/plugin-dev.hpp \
        cpp-common/bt2/private-query-executor.hpp \
+       cpp-common/bt2/raw-value-proxy.hpp \
        cpp-common/bt2/self-component-class.hpp \
        cpp-common/bt2/self-component-port.hpp \
        cpp-common/bt2/self-message-iterator-configuration.hpp \
@@ -42,21 +43,24 @@ noinst_HEADERS = \
        cpp-common/bt2/value.hpp \
        cpp-common/bt2/wrap.hpp \
        cpp-common/bt2c/align.hpp \
+       cpp-common/bt2c/c-string-view.hpp \
+       cpp-common/bt2c/call.hpp \
        cpp-common/bt2c/endian.hpp \
        cpp-common/bt2c/exc.hpp \
        cpp-common/bt2c/glib-up.hpp \
        cpp-common/bt2c/lib-str.hpp \
        cpp-common/bt2c/libc-up.hpp \
+       cpp-common/bt2c/logging.hpp \
+       cpp-common/bt2c/prio-heap.hpp \
        cpp-common/bt2c/read-fixed-len-int.hpp \
        cpp-common/bt2c/safe-ops.hpp \
        cpp-common/bt2c/std-int.hpp \
-       cpp-common/bt2c/uuid-view.hpp \
        cpp-common/bt2c/uuid.hpp \
        cpp-common/bt2c/vector.hpp \
        cpp-common/bt2s/make-unique.hpp \
        cpp-common/bt2s/optional.hpp \
        cpp-common/bt2s/string-view.hpp \
-       cpp-common/nlohmann/json.hpp \
+       cpp-common/vendor/nlohmann/json.hpp \
        cpp-common/vendor/optional-lite/optional.hpp \
        cpp-common/vendor/string_view-standalone/string_view.hpp
 
@@ -102,6 +106,7 @@ noinst_LTLIBRARIES = \
        autodisc/libautodisc.la \
        common/libcommon.la \
        compat/libcompat.la \
+       cpp-common/vendor/fmt/libfmt.la \
        ctfser/libctfser.la \
        fd-cache/libfd-cache.la \
        logging/liblogging.la \
@@ -158,6 +163,23 @@ compat_libcompat_la_SOURCES = \
        compat/unistd.h \
        compat/utc.h
 
+cpp_common_vendor_fmt_libfmt_la_SOURCES = \
+       cpp-common/vendor/fmt/args.h \
+       cpp-common/vendor/fmt/chrono.h \
+       cpp-common/vendor/fmt/color.h \
+       cpp-common/vendor/fmt/compile.h \
+       cpp-common/vendor/fmt/core.h \
+       cpp-common/vendor/fmt/format-inl.h \
+       cpp-common/vendor/fmt/format.cc \
+       cpp-common/vendor/fmt/format.h \
+       cpp-common/vendor/fmt/os.cc \
+       cpp-common/vendor/fmt/os.h \
+       cpp-common/vendor/fmt/ostream.h \
+       cpp-common/vendor/fmt/printf.h \
+       cpp-common/vendor/fmt/ranges.h \
+       cpp-common/vendor/fmt/std.h \
+       cpp-common/vendor/fmt/xchar.h
+
 ctfser_libctfser_la_SOURCES = \
        ctfser/ctfser.c \
        ctfser/ctfser.h
@@ -168,7 +190,8 @@ fd_cache_libfd_cache_la_SOURCES = \
 
 logging_liblogging_la_SOURCES = \
        logging/comp-logging.h \
-       logging/log.c \
+       logging/log-api.c \
+       logging/log-api.h \
        logging/log.h
 
 param_parse_libparam_parse_la_SOURCES = \
@@ -388,8 +411,6 @@ lib_libbabeltrace2_la_SOURCES = \
        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 \
@@ -572,11 +593,15 @@ plugins_utils_babeltrace_plugin_utils_la_SOURCES = \
        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/muxer/comp.cpp \
+       plugins/utils/muxer/comp.hpp \
+       plugins/utils/muxer/msg-iter.cpp \
+       plugins/utils/muxer/msg-iter.hpp \
+       plugins/utils/muxer/upstream-msg-iter.cpp \
+       plugins/utils/muxer/upstream-msg-iter.hpp \
        plugins/utils/trimmer/trimmer.c \
        plugins/utils/trimmer/trimmer.h \
-       plugins/utils/plugin.c
+       plugins/utils/plugin.cpp
 
 plugins_utils_babeltrace_plugin_utils_la_LDFLAGS = \
        $(AM_LDFLAGS) \
@@ -590,6 +615,7 @@ if !ENABLE_BUILT_IN_PLUGINS
 plugins_utils_babeltrace_plugin_utils_la_LIBADD += \
        lib/libbabeltrace2.la \
        common/libcommon.la \
+       cpp-common/vendor/fmt/libfmt.la \
        logging/liblogging.la \
        plugins/common/param-validation/libparam-validation.la
 endif