X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2FMakefile.am;fp=include%2FMakefile.am;h=159482c96ea08daa48a01a5e053338c38151545e;hp=dbb6efa5d796952fad49c7b59925b0b2f08efd04;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hpb=1cda4ff4025e4b3f7bd2a861baa51d2113c4cbf9

diff --git a/include/Makefile.am b/include/Makefile.am
index dbb6efa5..159482c9 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -2,18 +2,13 @@
 babeltrace2includedir = "$(includedir)/babeltrace2"
 babeltrace2include_HEADERS = \
 	babeltrace2/babeltrace.h \
-	babeltrace2/current-thread.h \
-	babeltrace2/error-cause-const.h \
-	babeltrace2/error-const.h \
+	babeltrace2/error-reporting.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/logging.h \
 	babeltrace2/types.h \
 	babeltrace2/util.h \
-	babeltrace2/value-const.h \
 	babeltrace2/value.h \
 	babeltrace2/version.h
 
@@ -39,94 +34,42 @@ babeltrace2ctfwriterinclude_HEADERS = \
 # Trace IR API
 babeltrace2traceirincludedir = "$(includedir)/babeltrace2/trace-ir"
 babeltrace2traceirinclude_HEADERS = \
-	babeltrace2/trace-ir/clock-class-const.h \
 	babeltrace2/trace-ir/clock-class.h \
-	babeltrace2/trace-ir/clock-snapshot-const.h \
-	babeltrace2/trace-ir/event-class-const.h \
+	babeltrace2/trace-ir/clock-snapshot.h \
 	babeltrace2/trace-ir/event-class.h \
-	babeltrace2/trace-ir/event-const.h \
 	babeltrace2/trace-ir/event.h \
-	babeltrace2/trace-ir/field-class-const.h \
 	babeltrace2/trace-ir/field-class.h \
-	babeltrace2/trace-ir/field-path-const.h \
-	babeltrace2/trace-ir/field-const.h \
+	babeltrace2/trace-ir/field-path.h \
 	babeltrace2/trace-ir/field.h \
-	babeltrace2/trace-ir/packet-const.h \
 	babeltrace2/trace-ir/packet.h \
-	babeltrace2/trace-ir/stream-class-const.h \
 	babeltrace2/trace-ir/stream-class.h \
-	babeltrace2/trace-ir/stream-const.h \
 	babeltrace2/trace-ir/stream.h \
-	babeltrace2/trace-ir/trace-class-const.h \
 	babeltrace2/trace-ir/trace-class.h \
-	babeltrace2/trace-ir/trace-const.h \
 	babeltrace2/trace-ir/trace.h
 
 # Plugin and plugin development API
 babeltrace2pluginincludedir = "$(includedir)/babeltrace2/plugin"
 babeltrace2plugininclude_HEADERS = \
 	babeltrace2/plugin/plugin-dev.h \
-	babeltrace2/plugin/plugin-const.h \
-	babeltrace2/plugin/plugin-set-const.h
+	babeltrace2/plugin/plugin-loading.h
 
 # Graph, component, and message API
 babeltrace2graphincludedir = "$(includedir)/babeltrace2/graph"
 babeltrace2graphinclude_HEADERS = \
-	babeltrace2/graph/component-class-const.h \
-	babeltrace2/graph/component-class-filter-const.h \
-	babeltrace2/graph/component-class-filter.h \
-	babeltrace2/graph/component-class-sink-const.h \
-	babeltrace2/graph/component-class-sink.h \
-	babeltrace2/graph/component-class-source-const.h \
-	babeltrace2/graph/component-class-source.h \
+	babeltrace2/graph/component-class-dev.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/component.h \
+	babeltrace2/graph/connection.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 \
-	babeltrace2/graph/message-discarded-packets-const.h \
-	babeltrace2/graph/message-discarded-packets.h \
-	babeltrace2/graph/message-event-const.h \
-	babeltrace2/graph/message-event.h \
-	babeltrace2/graph/message-message-iterator-inactivity-const.h \
-	babeltrace2/graph/message-message-iterator-inactivity.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-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/message-iterator.h \
+	babeltrace2/graph/message.h \
+	babeltrace2/graph/port.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.h \
-	babeltrace2/graph/self-component-port-output.h \
 	babeltrace2/graph/self-component-port.h \
-	babeltrace2/graph/self-component-sink.h \
-	babeltrace2/graph/self-component-source.h \
 	babeltrace2/graph/self-component.h \
 	babeltrace2/graph/self-message-iterator.h