ctf: add ClkClsConfig and use it

[babeltrace.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index e267ac9be2df841c51e9f81853005bde27fe3243..6b98e341782c1e51fb080cdcb05b137d0e6f84a4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -164,6 +164,8 @@ cpp_common_libcpp_common_la_SOURCES = \
        cpp-common/bt2c/dummy.cpp \
        cpp-common/bt2c/endian.hpp \
        cpp-common/bt2c/exc.hpp \
+       cpp-common/bt2c/file-utils.cpp \
+       cpp-common/bt2c/file-utils.hpp \
        cpp-common/bt2c/fmt.hpp \
        cpp-common/bt2c/glib-up.hpp \
        cpp-common/bt2c/libc-up.hpp \
@@ -183,7 +185,12 @@ cpp_common_libcpp_common_la_SOURCES = \
        cpp-common/vendor/nlohmann/json.hpp \
        cpp-common/vendor/optional-lite/optional.hpp \
        cpp-common/vendor/span-lite/span.hpp \
-       cpp-common/vendor/string-view-lite/string_view.hpp
+       cpp-common/vendor/string-view-lite/string_view.hpp \
+       cpp-common/vendor/wise-enum/optional.h \
+       cpp-common/vendor/wise-enum/optional_common.h \
+       cpp-common/vendor/wise-enum/wise_enum.h \
+       cpp-common/vendor/wise-enum/wise_enum_detail.h \
+       cpp-common/vendor/wise-enum/wise_enum_generated.h
 
 cpp_common_vendor_fmt_libfmt_la_SOURCES = \
        cpp-common/vendor/fmt/args.h \
@@ -202,6 +209,9 @@ cpp_common_vendor_fmt_libfmt_la_SOURCES = \
        cpp-common/vendor/fmt/std.h \
        cpp-common/vendor/fmt/xchar.h
 
+cpp_common_vendor_fmt_libfmt_la_CXXFLAGS = \
+       $(AM_CXXFLAGS) -Wno-missing-noreturn
+
 ctfser_libctfser_la_SOURCES = \
        ctfser/ctfser.c \
        ctfser/ctfser.h
@@ -275,7 +285,6 @@ plugins_ctf_common_metadata_libctf_ast_la_SOURCES = \
        plugins/ctf/common/src/metadata/tsdl/decoder.hpp \
        plugins/ctf/common/src/metadata/tsdl/decoder-packetized-file-stream-to-buf.cpp \
        plugins/ctf/common/src/metadata/tsdl/decoder-packetized-file-stream-to-buf.hpp \
-       plugins/ctf/common/src/metadata/tsdl/logging.cpp \
        plugins/ctf/common/src/metadata/tsdl/logging.hpp \
        plugins/ctf/common/src/metadata/tsdl/ctf-meta.hpp \
        plugins/ctf/common/src/metadata/tsdl/ctf-meta-visitors.hpp \
@@ -650,6 +659,7 @@ endif
 plugins_ctf_babeltrace_plugin_ctf_la_SOURCES = \
        plugins/ctf/common/src/bfcr/bfcr.cpp \
        plugins/ctf/common/src/bfcr/bfcr.hpp \
+       plugins/ctf/common/src/clk-cls-cfg.hpp \
        plugins/ctf/common/src/msg-iter/msg-iter.cpp \
        plugins/ctf/common/src/msg-iter/msg-iter.hpp \
        plugins/ctf/fs-sink/fs-sink.cpp \
@@ -705,7 +715,8 @@ plugins_ctf_babeltrace_plugin_ctf_la_LIBADD += \
        logging/liblogging.la \
        plugins/common/muxing/libmuxing.la \
        common/libcommon.la \
-       ctfser/libctfser.la
+       ctfser/libctfser.la \
+       cpp-common/vendor/fmt/libfmt.la
 endif
 
 # text plugin