Rename: bt_put(), bt_get() -> bt_object_put_ref(), bt_object_get_ref()

[babeltrace.git] / include / Makefile.am

diff --git a/include/Makefile.am b/include/Makefile.am
index 5bb35abe219af030e507b81c609744b7edabe423..75ec755eac6de9db3ea62ebf403135fa98b819bd 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -73,7 +73,7 @@ babeltraceincludedir = "$(includedir)/babeltrace"
 babeltraceinclude_HEADERS = \
        babeltrace/babeltrace.h \
        babeltrace/logging.h \
-       babeltrace/ref.h \
+       babeltrace/object.h \
        babeltrace/types.h \
        babeltrace/values.h \
        babeltrace/version.h
@@ -86,7 +86,6 @@ babeltracectfinclude_HEADERS = \
 # CTF writer API
 babeltracectfwriterincludedir = "$(includedir)/babeltrace/ctf-writer"
 babeltracectfwriterinclude_HEADERS = \
-       babeltrace/ctf-writer/clock-class.h \
        babeltrace/ctf-writer/clock.h \
        babeltrace/ctf-writer/event-fields.h \
        babeltrace/ctf-writer/event.h \
@@ -96,28 +95,42 @@ babeltracectfwriterinclude_HEADERS = \
        babeltrace/ctf-writer/stream-class.h \
        babeltrace/ctf-writer/stream.h \
        babeltrace/ctf-writer/trace.h \
+       babeltrace/ctf-writer/utils.h \
+       babeltrace/ctf-writer/visitor.h \
        babeltrace/ctf-writer/writer.h
 
-# CTF IR API
+# Legacy API (for CTF writer)
 babeltracectfirincludedir = "$(includedir)/babeltrace/ctf-ir"
 babeltracectfirinclude_HEADERS = \
-       babeltrace/ctf-ir/clock-class.h \
-       babeltrace/ctf-ir/clock-value.h \
        babeltrace/ctf-ir/clock.h \
-       babeltrace/ctf-ir/event-class.h \
+       babeltrace/ctf-ir/event-fields.h \
+       babeltrace/ctf-ir/event-types.h \
        babeltrace/ctf-ir/event.h \
-       babeltrace/ctf-ir/event-header-field.h \
-       babeltrace/ctf-ir/field-path.h \
        babeltrace/ctf-ir/field-types.h \
        babeltrace/ctf-ir/fields.h \
-       babeltrace/ctf-ir/packet.h \
-       babeltrace/ctf-ir/packet-context-field.h \
-       babeltrace/ctf-ir/packet-header-field.h \
        babeltrace/ctf-ir/stream-class.h \
        babeltrace/ctf-ir/stream.h \
        babeltrace/ctf-ir/trace.h \
-       babeltrace/ctf-ir/utils.h \
-       babeltrace/ctf-ir/visitor.h
+       babeltrace/ctf-ir/utils.h
+
+
+# Trace IR API
+babeltracetraceirincludedir = "$(includedir)/babeltrace/trace-ir"
+babeltracetraceirinclude_HEADERS = \
+       babeltrace/trace-ir/clock-class.h \
+       babeltrace/trace-ir/clock-value.h \
+       babeltrace/trace-ir/event-class.h \
+       babeltrace/trace-ir/event.h \
+       babeltrace/trace-ir/event-header-field.h \
+       babeltrace/trace-ir/field-path.h \
+       babeltrace/trace-ir/field-classes.h \
+       babeltrace/trace-ir/fields.h \
+       babeltrace/trace-ir/packet.h \
+       babeltrace/trace-ir/packet-context-field.h \
+       babeltrace/trace-ir/packet-header-field.h \
+       babeltrace/trace-ir/stream-class.h \
+       babeltrace/trace-ir/stream.h \
+       babeltrace/trace-ir/trace.h
 
 # Plugin and plugin development API
 babeltracepluginincludedir = "$(includedir)/babeltrace/plugin"
@@ -180,38 +193,44 @@ noinst_HEADERS = \
        babeltrace/plugin/python-plugin-provider-internal.h \
        babeltrace/assert-internal.h \
        babeltrace/values-internal.h \
-       babeltrace/ctf-writer/fields-internal.h \
-       babeltrace/ctf-writer/stream-class-internal.h \
+       babeltrace/ctf-writer/attributes-internal.h \
+       babeltrace/ctf-writer/clock-class-internal.h \
+       babeltrace/ctf-writer/clock-internal.h \
+       babeltrace/ctf-writer/event-class-internal.h \
        babeltrace/ctf-writer/event-internal.h \
-       babeltrace/ctf-writer/trace-internal.h \
+       babeltrace/ctf-writer/field-path-internal.h \
+       babeltrace/ctf-writer/fields-internal.h \
        babeltrace/ctf-writer/field-types-internal.h \
+       babeltrace/ctf-writer/field-wrapper-internal.h \
+       babeltrace/ctf-writer/functor-internal.h \
+       babeltrace/ctf-writer/resolve-internal.h \
        babeltrace/ctf-writer/serialize-internal.h \
-       babeltrace/ctf-writer/writer-internal.h \
+       babeltrace/ctf-writer/stream-class-internal.h \
        babeltrace/ctf-writer/stream-internal.h \
-       babeltrace/ctf-writer/clock-internal.h \
-       babeltrace/ctf-writer/functor-internal.h \
+       babeltrace/ctf-writer/trace-internal.h \
+       babeltrace/ctf-writer/utils-internal.h \
+       babeltrace/ctf-writer/validation-internal.h \
+       babeltrace/ctf-writer/visitor-internal.h \
+       babeltrace/ctf-writer/writer-internal.h \
        babeltrace/mmap-align-internal.h \
        babeltrace/align-internal.h \
        babeltrace/logging-internal.h \
        babeltrace/endian-internal.h \
-       babeltrace/ctf-ir/packet-internal.h \
-       babeltrace/ctf-ir/event-class-internal.h \
-       babeltrace/ctf-ir/utils-internal.h \
-       babeltrace/ctf-ir/validation-internal.h \
-       babeltrace/ctf-ir/fields-internal.h \
-       babeltrace/ctf-ir/stream-class-internal.h \
-       babeltrace/ctf-ir/event-internal.h \
-       babeltrace/ctf-ir/field-path-internal.h \
-       babeltrace/ctf-ir/field-wrapper-internal.h \
-       babeltrace/ctf-ir/trace-internal.h \
-       babeltrace/ctf-ir/clock-class-internal.h \
-       babeltrace/ctf-ir/field-types-internal.h \
-       babeltrace/ctf-ir/clock-value-internal.h \
-       babeltrace/ctf-ir/clock-value-set-internal.h \
-       babeltrace/ctf-ir/attributes-internal.h \
-       babeltrace/ctf-ir/stream-internal.h \
-       babeltrace/ctf-ir/resolve-internal.h \
-       babeltrace/ctf-ir/visitor-internal.h \
+       babeltrace/trace-ir/packet-internal.h \
+       babeltrace/trace-ir/event-class-internal.h \
+       babeltrace/trace-ir/utils-internal.h \
+       babeltrace/trace-ir/fields-internal.h \
+       babeltrace/trace-ir/stream-class-internal.h \
+       babeltrace/trace-ir/event-internal.h \
+       babeltrace/trace-ir/field-path-internal.h \
+       babeltrace/trace-ir/field-wrapper-internal.h \
+       babeltrace/trace-ir/trace-internal.h \
+       babeltrace/trace-ir/clock-class-internal.h \
+       babeltrace/trace-ir/field-classes-internal.h \
+       babeltrace/trace-ir/clock-value-internal.h \
+       babeltrace/trace-ir/attributes-internal.h \
+       babeltrace/trace-ir/stream-internal.h \
+       babeltrace/trace-ir/resolve-field-path-internal.h \
        babeltrace/prio-heap-internal.h \
        babeltrace/lib-logging-internal.h \
        babeltrace/compiler-internal.h \