logging: strip down and clean `log.h` and `log.c`

[babeltrace.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 0632a75422f4c90d2218da34e46f93f02cee8601..46b8633010f3f0a2b9c72a20a5415e3b9c605358 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,4 @@
+# SPDX-FileCopyrightText: 2019-2023 EfficiOS, Inc.
 # SPDX-License-Identifier: MIT
 
 # Build the current dir containing the library and plugins before the cli and
@@ -11,45 +12,53 @@ SUBDIRS += bindings/python/bt2
 endif
 
 noinst_HEADERS = \
+       cpp-common/bt2/borrowed-object-iterator.hpp \
+       cpp-common/bt2/borrowed-object-proxy.hpp \
+       cpp-common/bt2/borrowed-object.hpp \
        cpp-common/bt2/clock-class.hpp \
        cpp-common/bt2/clock-snapshot.hpp \
-       cpp-common/bt2/common-iter.hpp \
+       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/internal/borrowed-obj.hpp \
-       cpp-common/bt2/internal/shared-obj.hpp \
+       cpp-common/bt2/integer-range.hpp \
        cpp-common/bt2/internal/utils.hpp \
        cpp-common/bt2/logging.hpp \
+       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/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/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/bt2/wrap.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/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
@@ -159,7 +168,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 = \
@@ -705,3 +715,5 @@ plugins_lttng_utils_babeltrace_plugin_lttng_utils_la_LIBADD += \
        plugins/common/param-validation/libparam-validation.la
 endif # !ENABLE_BUILT_IN_PLUGINS
 endif # ENABLE_DEBUG_INFO
+
+EXTRA_DIST = cpp-common/optional.hpp.license