X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2FMakefile.am;h=98d0e31be94cb8f94df6b8c570dad39afc9c8e04;hb=eb171ee910c59b97919b1ad3522c02d01037e6c6;hp=72fa2761e2b560c5508c9b4e593b4eb0300ab9d4;hpb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;p=babeltrace.git

diff --git a/include/Makefile.am b/include/Makefile.am
index 72fa2761..98d0e31b 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -6,7 +6,10 @@ babeltrace2include_HEADERS = \
 	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 \
@@ -14,43 +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/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
+	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"
@@ -98,12 +82,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 \
@@ -123,15 +111,17 @@ babeltrace2graphinclude_HEADERS = \
 	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 \