X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2FMakefile.am;h=3c4969ccd59d08a0f32cb6684bce6d5575b645b2;hb=HEAD;hp=e7f32eab13e7765793b56c9a8ae0046e881fb353;hpb=f79cf0f0781f10167a01c9d8b925fd116d184c83;p=babeltrace.git

diff --git a/include/Makefile.am b/include/Makefile.am
index e7f32eab..3c4969cc 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,89 +1,77 @@
-babeltraceinclude_HEADERS = \
-	babeltrace/babeltrace.h \
-	babeltrace/format.h \
-	babeltrace/context.h \
-	babeltrace/iterator.h \
-	babeltrace/trace-handle.h \
-	babeltrace/list.h \
-	babeltrace/clock-types.h \
-	babeltrace/values.h \
-	babeltrace/ref.h
+# SPDX-License-Identifier: MIT
 
-babeltracectfinclude_HEADERS = \
-	babeltrace/ctf/events.h \
-	babeltrace/ctf/callbacks.h \
-	babeltrace/ctf/iterator.h
+# Core API
+babeltrace2includedir = "$(includedir)/babeltrace2"
+babeltrace2include_HEADERS = \
+	babeltrace2/babeltrace.h \
+	babeltrace2/error-reporting.h \
+	babeltrace2/func-status.h \
+	babeltrace2/integer-range-set.h \
+	babeltrace2/logging-defs.h \
+	babeltrace2/logging.h \
+	babeltrace2/types.h \
+	babeltrace2/util.h \
+	babeltrace2/value.h \
+	babeltrace2/version.h
 
-babeltracectfwriterinclude_HEADERS = \
-	babeltrace/ctf-writer/clock.h \
-	babeltrace/ctf-writer/writer.h \
-	babeltrace/ctf-writer/event-fields.h \
-	babeltrace/ctf-writer/event-types.h \
-	babeltrace/ctf-writer/event.h \
-	babeltrace/ctf-writer/stream.h \
-	babeltrace/ctf-writer/stream-class.h
+# CTF writer API
+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
 
-babeltracectfirinclude_HEADERS = \
-	babeltrace/ctf-ir/clock.h \
-	babeltrace/ctf-ir/fields.h \
-	babeltrace/ctf-ir/field-types.h \
-	babeltrace/ctf-ir/event.h \
-	babeltrace/ctf-ir/event-class.h \
-	babeltrace/ctf-ir/field-path.h \
-	babeltrace/ctf-ir/stream.h \
-	babeltrace/ctf-ir/packet.h \
-	babeltrace/ctf-ir/stream-class.h \
-	babeltrace/ctf-ir/trace.h \
-	babeltrace/ctf-ir/utils.h
+# Trace IR API
+babeltrace2traceirincludedir = "$(includedir)/babeltrace2/trace-ir"
+babeltrace2traceirinclude_HEADERS = \
+	babeltrace2/trace-ir/clock-class.h \
+	babeltrace2/trace-ir/clock-snapshot.h \
+	babeltrace2/trace-ir/event-class.h \
+	babeltrace2/trace-ir/event.h \
+	babeltrace2/trace-ir/field-class.h \
+	babeltrace2/trace-ir/field-path.h \
+	babeltrace2/trace-ir/field.h \
+	babeltrace2/trace-ir/packet.h \
+	babeltrace2/trace-ir/stream-class.h \
+	babeltrace2/trace-ir/stream.h \
+	babeltrace2/trace-ir/trace-class.h \
+	babeltrace2/trace-ir/trace.h
 
-noinst_HEADERS = \
-	babeltrace/align.h \
-	babeltrace/babeltrace-internal.h \
-	babeltrace/bitfield.h \
-	babeltrace/clock-internal.h \
-	babeltrace/compiler.h \
-	babeltrace/context-internal.h \
-	babeltrace/format-internal.h \
-	babeltrace/iterator-internal.h \
-	babeltrace/trace-collection.h \
-	babeltrace/prio_heap.h \
-	babeltrace/ref-internal.h \
-	babeltrace/types.h \
-	babeltrace/object-internal.h \
-	babeltrace/ctf-ir/metadata.h \
-	babeltrace/ctf/events-internal.h \
-	babeltrace/ctf/metadata.h \
-	babeltrace/ctf-text/types.h \
-	babeltrace/ctf/types.h \
-	babeltrace/ctf/callbacks-internal.h \
-	babeltrace/ctf/ctf-index.h \
-	babeltrace/ctf-writer/writer-internal.h \
-	babeltrace/ctf-ir/attributes-internal.h \
-	babeltrace/ctf-ir/field-types-internal.h \
-	babeltrace/ctf-ir/fields-internal.h \
-	babeltrace/ctf-ir/event-internal.h \
-	babeltrace/ctf-ir/event-class-internal.h \
-	babeltrace/ctf-ir/field-path-internal.h \
-	babeltrace/ctf-ir/clock-internal.h \
-	babeltrace/ctf-ir/resolve-internal.h \
-	babeltrace/ctf-ir/stream-class-internal.h \
-	babeltrace/ctf-ir/stream-internal.h \
-	babeltrace/ctf-ir/packet-internal.h \
-	babeltrace/ctf-ir/trace-internal.h \
-	babeltrace/ctf-ir/validation-internal.h \
-	babeltrace/ctf-writer/functor-internal.h \
-	babeltrace/trace-handle-internal.h \
-	babeltrace/compat/uuid.h \
-	babeltrace/compat/memstream.h \
-	babeltrace/compat/string.h \
-	babeltrace/compat/utc.h \
-	babeltrace/compat/limits.h \
-	babeltrace/compat/glib.h \
-	babeltrace/compat/send.h \
-	babeltrace/compat/fcntl.h \
-	babeltrace/compat/stdlib.h \
-	babeltrace/compat/dirent.h \
-	babeltrace/compat/stdio.h \
-	babeltrace/compat/mman.h \
-	babeltrace/endian.h \
-	babeltrace/mmap-align.h
+# Plugin and plugin development API
+babeltrace2pluginincludedir = "$(includedir)/babeltrace2/plugin"
+babeltrace2plugininclude_HEADERS = \
+	babeltrace2/plugin/plugin-dev.h \
+	babeltrace2/plugin/plugin-loading.h
+
+# Graph, component, and message API
+babeltrace2graphincludedir = "$(includedir)/babeltrace2/graph"
+babeltrace2graphinclude_HEADERS = \
+	babeltrace2/graph/component-class-dev.h \
+	babeltrace2/graph/component-class.h \
+	babeltrace2/graph/component-descriptor-set.h \
+	babeltrace2/graph/component.h \
+	babeltrace2/graph/connection.h \
+	babeltrace2/graph/graph.h \
+	babeltrace2/graph/interrupter.h \
+	babeltrace2/graph/message-iterator-class.h \
+	babeltrace2/graph/message-iterator.h \
+	babeltrace2/graph/message.h \
+	babeltrace2/graph/port.h \
+	babeltrace2/graph/private-query-executor.h \
+	babeltrace2/graph/query-executor.h \
+	babeltrace2/graph/self-component-class.h \
+	babeltrace2/graph/self-component-port.h \
+	babeltrace2/graph/self-component.h \
+	babeltrace2/graph/self-message-iterator.h