cpp-common: replace bstd::string_view with nonstd::string_view

[babeltrace.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 3427a88d7beae9dcb52a72dc21dc354bd36c97cf..98d281a637003a42698bd767b9bbd5ed2301c169 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -117,13 +117,17 @@ cpp_common_libcpp_common_la_SOURCES = \
        cpp-common/bt2/borrowed-object.hpp \
        cpp-common/bt2/clock-class.hpp \
        cpp-common/bt2/clock-snapshot.hpp \
+       cpp-common/bt2/component-class-dev.hpp \
+       cpp-common/bt2/component-class.hpp \
        cpp-common/bt2/component-port.hpp \
+       cpp-common/bt2/graph.hpp \
        cpp-common/bt2/exc.hpp \
        cpp-common/bt2/field-class.hpp \
        cpp-common/bt2/field-path.hpp \
        cpp-common/bt2/field.hpp \
        cpp-common/bt2/integer-range-set.hpp \
        cpp-common/bt2/integer-range.hpp \
+       cpp-common/bt2/internal/comp-cls-bridge.hpp \
        cpp-common/bt2/internal/utils.hpp \
        cpp-common/bt2/logging.hpp \
        cpp-common/bt2/message-array.hpp \
@@ -131,8 +135,11 @@ cpp_common_libcpp_common_la_SOURCES = \
        cpp-common/bt2/message.hpp \
        cpp-common/bt2/optional-borrowed-object.hpp \
        cpp-common/bt2/plugin-dev.hpp \
+       cpp-common/bt2/plugin-load.hpp \
+       cpp-common/bt2/plugin-set.hpp \
        cpp-common/bt2/plugin.hpp \
        cpp-common/bt2/private-query-executor.hpp \
+       cpp-common/bt2/query-executor.hpp \
        cpp-common/bt2/raw-value-proxy.hpp \
        cpp-common/bt2/self-component-class.hpp \
        cpp-common/bt2/self-component-port.hpp \
@@ -149,8 +156,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/fmt.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 \
@@ -167,7 +174,7 @@ 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-standalone/string_view.hpp
+       cpp-common/vendor/string-view-lite/string_view.hpp
 
 cpp_common_vendor_fmt_libfmt_la_SOURCES = \
        cpp-common/vendor/fmt/args.h \
@@ -378,7 +385,6 @@ lib_libbabeltrace2_la_SOURCES = \
        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 \
@@ -408,6 +414,7 @@ lib_libbabeltrace2_la_SOURCES = \
        lib/graph/interrupter.c \
        lib/graph/interrupter.h \
        lib/graph/iterator.c \
+       lib/graph/iterator.h \
        lib/graph/mip.c \
        lib/graph/port.c \
        lib/graph/port.h \
@@ -749,4 +756,5 @@ endif # ENABLE_DEBUG_INFO
 
 EXTRA_DIST = \
        cpp-common/vendor/optional-lite/optional.hpp.license \
-       cpp-common/vendor/span-lite/span.hpp.license
+       cpp-common/vendor/span-lite/span.hpp.license \
+       cpp-common/vendor/string-view-lite/string_view.hpp.license