cpp-common/bt2c: add `bt2c::PrioHeap` (C++ version of `bt_heap_` C API)

[babeltrace.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a2c5d8a8d4c4d8fa00633dca082127c6d945ef61..2166e36d00358d3342aaddc1599def1f912a45be 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,10 +20,10 @@ noinst_HEADERS = \
        cpp-common/bt2/component-port.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/field.hpp \
        cpp-common/bt2/integer-range-set.hpp \
+       cpp-common/bt2/integer-range.hpp \
        cpp-common/bt2/internal/utils.hpp \
        cpp-common/bt2/logging.hpp \
        cpp-common/bt2/message-array.hpp \
@@ -31,37 +31,37 @@ noinst_HEADERS = \
        cpp-common/bt2/message.hpp \
        cpp-common/bt2/shared-object.hpp \
        cpp-common/bt2/raw-value-proxy.hpp \
+       cpp-common/bt2/plugin-dev.hpp \
        cpp-common/bt2/private-query-executor.hpp \
        cpp-common/bt2/self-component-class.hpp \
        cpp-common/bt2/self-component-port.hpp \
        cpp-common/bt2/self-message-iterator-configuration.hpp \
        cpp-common/bt2/self-message-iterator.hpp \
+       cpp-common/bt2/shared-object.hpp \
        cpp-common/bt2/trace-ir.hpp \
        cpp-common/bt2/type-traits.hpp \
        cpp-common/bt2/value.hpp \
        cpp-common/bt2/wrap.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
+       cpp-common/bt2c/align.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/vendor/nlohmann/json.hpp \
+       cpp-common/vendor/optional-lite/optional.hpp \
+       cpp-common/vendor/string_view-standalone/string_view.hpp
 
 ## This target generates an include file that contains the git version
 ## string of the current branch, it must be continuously updated when
@@ -105,6 +105,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 \
@@ -161,6 +162,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
@@ -171,7 +189,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 = \
@@ -391,8 +410,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 \