X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2FMakefile.am;h=fa75c7c359a6ca46a4713333053b11ff9b8ab958;hb=0f15f66682cac676ce437aaa58cf114f315628ad;hp=7a716590a0187428ea06b3d7fcb9b0b714099bf4;hpb=3a2cb327fd24e53a9b163372b9079003dd422655;p=babeltrace.git

diff --git a/include/Makefile.am b/include/Makefile.am
index 7a716590..fa75c7c3 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -76,8 +76,8 @@ babeltraceinclude_HEADERS = \
 	babeltrace/object.h \
 	babeltrace/property.h \
 	babeltrace/types.h \
-	babeltrace/values-const.h \
-	babeltrace/values.h \
+	babeltrace/value-const.h \
+	babeltrace/value.h \
 	babeltrace/version.h
 
 # Legacy API (for CTF writer)
@@ -126,11 +126,11 @@ babeltracetraceirinclude_HEADERS = \
 	babeltrace/trace-ir/event-const.h \
 	babeltrace/trace-ir/event-header-field.h \
 	babeltrace/trace-ir/event.h \
-	babeltrace/trace-ir/field-classes-const.h \
-	babeltrace/trace-ir/field-classes.h \
+	babeltrace/trace-ir/field-class-const.h \
+	babeltrace/trace-ir/field-class.h \
 	babeltrace/trace-ir/field-path-const.h \
-	babeltrace/trace-ir/fields-const.h \
-	babeltrace/trace-ir/fields.h \
+	babeltrace/trace-ir/field-const.h \
+	babeltrace/trace-ir/field.h \
 	babeltrace/trace-ir/packet-const.h \
 	babeltrace/trace-ir/packet-context-field.h \
 	babeltrace/trace-ir/packet-header-field.h \
@@ -139,6 +139,8 @@ babeltracetraceirinclude_HEADERS = \
 	babeltrace/trace-ir/stream-class.h \
 	babeltrace/trace-ir/stream-const.h \
 	babeltrace/trace-ir/stream.h \
+	babeltrace/trace-ir/trace-class-const.h \
+	babeltrace/trace-ir/trace-class.h \
 	babeltrace/trace-ir/trace-const.h \
 	babeltrace/trace-ir/trace.h
 
@@ -152,37 +154,35 @@ babeltraceplugininclude_HEADERS = \
 # Graph, component, and notification API
 babeltracegraphincludedir = "$(includedir)/babeltrace/graph"
 babeltracegraphinclude_HEADERS = \
+	babeltrace/graph/component-class-const.h \
+	babeltrace/graph/component-class-filter-const.h \
 	babeltrace/graph/component-class-filter.h \
-	babeltrace/graph/component-class.h \
+	babeltrace/graph/component-class-sink-const.h \
 	babeltrace/graph/component-class-sink.h \
+	babeltrace/graph/component-class-source-const.h \
 	babeltrace/graph/component-class-source.h \
-	babeltrace/graph/component-filter.h \
-	babeltrace/graph/component.h \
-	babeltrace/graph/component-sink.h \
-	babeltrace/graph/component-source.h \
-	babeltrace/graph/connection.h \
+	babeltrace/graph/component-class.h \
+	babeltrace/graph/component-const.h \
+	babeltrace/graph/component-filter-const.h \
+	babeltrace/graph/component-sink-const.h \
+	babeltrace/graph/component-source-const.h \
+	babeltrace/graph/connection-const.h \
+	babeltrace/graph/graph-const.h \
 	babeltrace/graph/graph.h \
+	babeltrace/graph/notification-const.h \
+	babeltrace/graph/notification-event-const.h \
 	babeltrace/graph/notification-event.h \
+	babeltrace/graph/notification-inactivity-const.h \
 	babeltrace/graph/notification-inactivity.h \
-	babeltrace/graph/notification-iterator.h \
+	babeltrace/graph/notification-packet-const.h \
 	babeltrace/graph/notification-packet.h \
+	babeltrace/graph/notification-stream-const.h \
 	babeltrace/graph/notification-stream.h \
-	babeltrace/graph/notification.h \
-	babeltrace/graph/port-input.h \
+	babeltrace/graph/port-const.h \
+	babeltrace/graph/port-input-const.h \
+	babeltrace/graph/port-output-const.h \
 	babeltrace/graph/port-output-notification-iterator.h \
-	babeltrace/graph/port-output.h \
-	babeltrace/graph/port.h \
-	babeltrace/graph/private-component-class-filter.h \
-	babeltrace/graph/private-component-class-sink.h \
-	babeltrace/graph/private-component-class-source.h \
-	babeltrace/graph/private-component-class.h \
-	babeltrace/graph/private-graph.h \
-	babeltrace/graph/private-notification-event.h \
-	babeltrace/graph/private-notification-inactivity.h \
-	babeltrace/graph/private-notification-packet.h \
-	babeltrace/graph/private-notification-stream.h \
-	babeltrace/graph/private-notification.h \
-	babeltrace/graph/private-query-executor.h \
+	babeltrace/graph/query-executor-const.h \
 	babeltrace/graph/query-executor.h \
 	babeltrace/graph/self-component-class-filter.h \
 	babeltrace/graph/self-component-class-sink.h \
@@ -219,7 +219,7 @@ noinst_HEADERS = \
 	babeltrace/plugin/plugin-so-internal.h \
 	babeltrace/plugin/python-plugin-provider-internal.h \
 	babeltrace/assert-internal.h \
-	babeltrace/values-internal.h \
+	babeltrace/value-internal.h \
 	babeltrace/ctf-writer/attributes-internal.h \
 	babeltrace/ctf-writer/clock-class-internal.h \
 	babeltrace/ctf-writer/clock-internal.h \
@@ -249,9 +249,9 @@ noinst_HEADERS = \
 	babeltrace/trace-ir/clock-value-set-internal.h \
 	babeltrace/trace-ir/event-class-internal.h \
 	babeltrace/trace-ir/event-internal.h \
-	babeltrace/trace-ir/field-classes-internal.h \
+	babeltrace/trace-ir/field-class-internal.h \
 	babeltrace/trace-ir/field-path-internal.h \
-	babeltrace/trace-ir/fields-internal.h \
+	babeltrace/trace-ir/field-internal.h \
 	babeltrace/trace-ir/field-wrapper-internal.h \
 	babeltrace/trace-ir/packet-internal.h \
 	babeltrace/trace-ir/resolve-field-path-internal.h \