X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2FMakefile.am;h=f2ff631be4b1728daa3a0250cc34845c78677de8;hb=078033edee10d9764e5779f081b38507af41bdcf;hp=95a3327e9f9bd965f5e343627ba7291f9892dc02;hpb=004090977e6698a39035bb20b5ba4d5da23a6718;p=babeltrace.git

diff --git a/include/Makefile.am b/include/Makefile.am
index 95a3327e..f2ff631b 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -2,56 +2,38 @@
 babeltrace2includedir = "$(includedir)/babeltrace2"
 babeltrace2include_HEADERS = \
 	babeltrace2/babeltrace.h \
-	babeltrace2/func-status.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/property.h \
 	babeltrace2/types.h \
-	babeltrace2/undef-func-status.h \
 	babeltrace2/util.h \
 	babeltrace2/value-const.h \
 	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"
@@ -105,6 +87,8 @@ babeltrace2graphinclude_HEADERS = \
 	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 \
@@ -127,7 +111,7 @@ babeltrace2graphinclude_HEADERS = \
 	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 \