X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2FMakefile.am;h=e115d36b4e8a727971c010866e883c89963b1d42;hb=c7eee084ca459af66ba1f6d375fba3f89db93584;hp=aeb7cdd8aa8a2e98f757334afcdc91b146e3c063;hpb=1cb3cdd7f163147ccc0ecfd7e421008eec799d64;p=babeltrace.git

diff --git a/include/Makefile.am b/include/Makefile.am
index aeb7cdd8..e115d36b 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,5 @@
 # Core API
+babeltraceincludedir = "$(includedir)/babeltrace"
 babeltraceinclude_HEADERS = \
 	babeltrace/babeltrace.h \
 	babeltrace/values.h \
@@ -8,10 +9,12 @@ babeltraceinclude_HEADERS = \
 	babeltrace/types.h
 
 # Legacy API (for CTF writer)
+babeltracectfincludedir = "$(includedir)/babeltrace/ctf"
 babeltracectfinclude_HEADERS = \
 	babeltrace/ctf/events.h
 
 # CTF writer API
+babeltracectfwriterincludedir = "$(includedir)/babeltrace/ctf-writer"
 babeltracectfwriterinclude_HEADERS = \
 	babeltrace/ctf-writer/clock.h \
 	babeltrace/ctf-writer/writer.h \
@@ -22,6 +25,7 @@ babeltracectfwriterinclude_HEADERS = \
 	babeltrace/ctf-writer/stream-class.h
 
 # CTF IR API
+babeltracectfirincludedir = "$(includedir)/babeltrace/ctf-ir"
 babeltracectfirinclude_HEADERS = \
 	babeltrace/ctf-ir/clock-class.h \
 	babeltrace/ctf-ir/fields.h \
@@ -37,14 +41,17 @@ babeltracectfirinclude_HEADERS = \
 	babeltrace/ctf-ir/visitor.h
 
 # Plugin and plugin development API
+babeltracepluginincludedir = "$(includedir)/babeltrace/plugin"
 babeltraceplugininclude_HEADERS = \
 	babeltrace/plugin/plugin.h \
 	babeltrace/plugin/plugin-dev.h
 
 # Graph, component, and notification API
+babeltracegraphincludedir = "$(includedir)/babeltrace/graph"
 babeltracegraphinclude_HEADERS = \
 	babeltrace/graph/clock-class-priority-map.h \
 	babeltrace/graph/component-class-filter.h \
+	babeltrace/graph/component-class-sink-colander.h \
 	babeltrace/graph/component-class-sink.h \
 	babeltrace/graph/component-class-source.h \
 	babeltrace/graph/component-class.h \
@@ -55,6 +62,8 @@ babeltracegraphinclude_HEADERS = \
 	babeltrace/graph/component.h \
 	babeltrace/graph/connection.h \
 	babeltrace/graph/graph.h \
+	babeltrace/graph/notification-discarded-events.h \
+	babeltrace/graph/notification-discarded-packets.h \
 	babeltrace/graph/notification-event.h \
 	babeltrace/graph/notification-heap.h \
 	babeltrace/graph/notification-inactivity.h \
@@ -63,6 +72,7 @@ babeltracegraphinclude_HEADERS = \
 	babeltrace/graph/notification-packet.h \
 	babeltrace/graph/notification-stream.h \
 	babeltrace/graph/port.h \
+	babeltrace/graph/query-executor.h \
 	babeltrace/graph/private-component-filter.h \
 	babeltrace/graph/private-component-sink.h \
 	babeltrace/graph/private-component-source.h \
@@ -88,7 +98,6 @@ noinst_HEADERS = \
 	babeltrace/compat/time-internal.h \
 	babeltrace/compat/unistd-internal.h \
 	babeltrace/compat/utc-internal.h \
-	babeltrace/compat/utsname-internal.h \
 	babeltrace/compat/uuid-internal.h \
 	babeltrace/compiler-internal.h \
 	babeltrace/ctf-ir/attributes-internal.h \
@@ -118,6 +127,7 @@ noinst_HEADERS = \
 	babeltrace/graph/component-source-internal.h \
 	babeltrace/graph/connection-internal.h \
 	babeltrace/graph/graph-internal.h \
+	babeltrace/graph/notification-discarded-elements-internal.h \
 	babeltrace/graph/notification-event-internal.h \
 	babeltrace/graph/notification-heap-internal.h \
 	babeltrace/graph/notification-inactivity-internal.h \
@@ -126,6 +136,7 @@ noinst_HEADERS = \
 	babeltrace/graph/notification-packet-internal.h \
 	babeltrace/graph/notification-stream-internal.h \
 	babeltrace/graph/port-internal.h \
+	babeltrace/graph/query-executor-internal.h \
 	babeltrace/lib-logging-internal.h \
 	babeltrace/list-internal.h \
 	babeltrace/logging-internal.h \