Remove legacy `include/babeltrace2/{ctf-ir,ctf}` directories

[babeltrace.git] / include / Makefile.am

diff --git a/include/Makefile.am b/include/Makefile.am
index 9b4f0530d6c4a77f6850b6c1c623d99da331df54..339ccc2217d5567eda383581d4bc7d2a0c5f95df 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -2,6 +2,10 @@
 babeltrace2includedir = "$(includedir)/babeltrace2"
 babeltrace2include_HEADERS = \
        babeltrace2/babeltrace.h \
+       babeltrace2/current-thread.h \
+       babeltrace2/error-cause-const.h \
+       babeltrace2/error-const.h \
+       babeltrace2/func-status.h \
        babeltrace2/logging.h \
        babeltrace2/property.h \
        babeltrace2/types.h \
@@ -10,11 +14,6 @@ babeltrace2include_HEADERS = \
        babeltrace2/value.h \
        babeltrace2/version.h
 
-# Legacy API (for CTF writer)
-babeltrace2ctfincludedir = "$(includedir)/babeltrace2/ctf"
-babeltrace2ctfinclude_HEADERS = \
-       babeltrace2/ctf/events.h
-
 # CTF writer API
 babeltrace2ctfwriterincludedir = "$(includedir)/babeltrace2/ctf-writer"
 babeltrace2ctfwriterinclude_HEADERS = \
@@ -29,24 +28,11 @@ babeltrace2ctfwriterinclude_HEADERS = \
        babeltrace2/ctf-writer/stream-class.h \
        babeltrace2/ctf-writer/stream.h \
        babeltrace2/ctf-writer/trace.h \
+       babeltrace2/ctf-writer/types.h \
        babeltrace2/ctf-writer/utils.h \
        babeltrace2/ctf-writer/visitor.h \
        babeltrace2/ctf-writer/writer.h
 
-# Legacy API (for CTF writer)
-babeltrace2ctfirincludedir = "$(includedir)/babeltrace2/ctf-ir"
-babeltrace2ctfirinclude_HEADERS = \
-       babeltrace2/ctf-ir/clock.h \
-       babeltrace2/ctf-ir/event-fields.h \
-       babeltrace2/ctf-ir/event-types.h \
-       babeltrace2/ctf-ir/event.h \
-       babeltrace2/ctf-ir/field-types.h \
-       babeltrace2/ctf-ir/fields.h \
-       babeltrace2/ctf-ir/stream-class.h \
-       babeltrace2/ctf-ir/stream.h \
-       babeltrace2/ctf-ir/trace.h \
-       babeltrace2/ctf-ir/utils.h
-
 # Trace IR API
 babeltrace2traceirincludedir = "$(includedir)/babeltrace2/trace-ir"
 babeltrace2traceirinclude_HEADERS = \
@@ -108,18 +94,14 @@ babeltrace2graphinclude_HEADERS = \
        babeltrace2/graph/message-event.h \
        babeltrace2/graph/message-message-iterator-inactivity-const.h \
        babeltrace2/graph/message-message-iterator-inactivity.h \
-       babeltrace2/graph/message-iterator-const.h \
+       babeltrace2/graph/message-iterator.h \
        babeltrace2/graph/message-packet-beginning-const.h \
        babeltrace2/graph/message-packet-beginning.h \
        babeltrace2/graph/message-packet-end-const.h \
        babeltrace2/graph/message-packet-end.h \
-       babeltrace2/graph/message-stream-activity-beginning-const.h \
-       babeltrace2/graph/message-stream-activity-beginning.h \
-       babeltrace2/graph/message-stream-activity-const.h \
-       babeltrace2/graph/message-stream-activity-end-const.h \
-       babeltrace2/graph/message-stream-activity-end.h \
        babeltrace2/graph/message-stream-beginning-const.h \
        babeltrace2/graph/message-stream-beginning.h \
+       babeltrace2/graph/message-stream-const.h \
        babeltrace2/graph/message-stream-end-const.h \
        babeltrace2/graph/message-stream-end.h \
        babeltrace2/graph/port-const.h \