X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2FMakefile.am;h=a44ef6ee0c0b9741d47fb9e84054f09f3ddcdd94;hb=a3f0c7db90f4cfc81090a83a7442b7bc624d5789;hp=9b4f0530d6c4a77f6850b6c1c623d99da331df54;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d;p=babeltrace.git

diff --git a/include/Makefile.am b/include/Makefile.am
index 9b4f0530..a44ef6ee 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -2,7 +2,14 @@
 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/integer-range-set-const.h \
+	babeltrace2/integer-range-set.h \
 	babeltrace2/logging.h \
+	babeltrace2/logging-defs.h \
 	babeltrace2/property.h \
 	babeltrace2/types.h \
 	babeltrace2/util.h \
@@ -10,42 +17,24 @@ 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"
+babeltrace2ctfwriterincludedir = "$(includedir)/babeltrace2-ctf-writer"
 babeltrace2ctfwriterinclude_HEADERS = \
-	babeltrace2/ctf-writer/clock-class.h \
-	babeltrace2/ctf-writer/clock.h \
-	babeltrace2/ctf-writer/event-fields.h \
-	babeltrace2/ctf-writer/event-types.h \
-	babeltrace2/ctf-writer/event.h \
-	babeltrace2/ctf-writer/field-types.h \
-	babeltrace2/ctf-writer/fields.h \
-	babeltrace2/ctf-writer/object.h \
-	babeltrace2/ctf-writer/stream-class.h \
-	babeltrace2/ctf-writer/stream.h \
-	babeltrace2/ctf-writer/trace.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
+	babeltrace2-ctf-writer/clock-class.h \
+	babeltrace2-ctf-writer/clock.h \
+	babeltrace2-ctf-writer/event-fields.h \
+	babeltrace2-ctf-writer/event-types.h \
+	babeltrace2-ctf-writer/event.h \
+	babeltrace2-ctf-writer/field-types.h \
+	babeltrace2-ctf-writer/fields.h \
+	babeltrace2-ctf-writer/object.h \
+	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
 
 # Trace IR API
 babeltrace2traceirincludedir = "$(includedir)/babeltrace2/trace-ir"
@@ -63,7 +52,6 @@ babeltrace2traceirinclude_HEADERS = \
 	babeltrace2/trace-ir/field-const.h \
 	babeltrace2/trace-ir/field.h \
 	babeltrace2/trace-ir/packet-const.h \
-	babeltrace2/trace-ir/packet-context-field.h \
 	babeltrace2/trace-ir/packet.h \
 	babeltrace2/trace-ir/stream-class-const.h \
 	babeltrace2/trace-ir/stream-class.h \
@@ -93,12 +81,16 @@ babeltrace2graphinclude_HEADERS = \
 	babeltrace2/graph/component-class-source.h \
 	babeltrace2/graph/component-class.h \
 	babeltrace2/graph/component-const.h \
+	babeltrace2/graph/component-descriptor-set-const.h \
+	babeltrace2/graph/component-descriptor-set.h \
 	babeltrace2/graph/component-filter-const.h \
 	babeltrace2/graph/component-sink-const.h \
 	babeltrace2/graph/component-source-const.h \
 	babeltrace2/graph/connection-const.h \
 	babeltrace2/graph/graph-const.h \
 	babeltrace2/graph/graph.h \
+	babeltrace2/graph/interrupter-const.h \
+	babeltrace2/graph/interrupter.h \
 	babeltrace2/graph/message-const.h \
 	babeltrace2/graph/message-discarded-events-const.h \
 	babeltrace2/graph/message-discarded-events.h \
@@ -108,29 +100,28 @@ 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-iterator-class.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/mip.h \
 	babeltrace2/graph/port-const.h \
 	babeltrace2/graph/port-input-const.h \
 	babeltrace2/graph/port-output-const.h \
-	babeltrace2/graph/port-output-message-iterator.h \
+	babeltrace2/graph/private-query-executor.h \
 	babeltrace2/graph/query-executor-const.h \
 	babeltrace2/graph/query-executor.h \
 	babeltrace2/graph/self-component-class-filter.h \
 	babeltrace2/graph/self-component-class-sink.h \
 	babeltrace2/graph/self-component-class-source.h \
+	babeltrace2/graph/self-component-class.h \
 	babeltrace2/graph/self-component-filter.h \
 	babeltrace2/graph/self-component-port-input-message-iterator.h \
 	babeltrace2/graph/self-component-port-input.h \