X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2FMakefile.am;h=9583c8b6d7d9dd2dcc5ce4226c9b700fefc683c7;hb=5b4c6da4aa59719b613c612afc05aee91f4343a4;hp=4f376529c45ea97de69113e09fc01590bc0f2d23;hpb=e41474be35fb9a706872316b06127d108b86b617;p=lttng-ust.git

diff --git a/include/Makefile.am b/include/Makefile.am
index 4f376529..9583c8b6 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,37 +1,75 @@
+# SPDX-License-Identifier: LGPL-2.1-only
+
+###                    ###
+### Public API headers ###
+###                    ###
+
 nobase_include_HEADERS = \
-	ust/marker.h \
-	ust/tracepoint.h \
-	ust/tracepoint-event.h \
-	ust/lttng-tracepoint-event.h \
-	ust/lttng-tracepoint-event-reset.h \
-	ust/lttng-events.h \
-	ust/lttng-ust-ctl.h \
-	ust/version.h \
-	ust/lttng-ust-abi.h \
-	ust/lttng-ust-comm.h \
-	ust/ringbuffer-abi.h \
-	ust/lttng-tracer.h \
-	ust/usterr-signal-safe.h \
-	ust/config.h \
-	ust/share.h \
-	ust/ust.h \
-	ust/core.h
-
-# note: usterr-signal-safe.h, core.h and share.h need namespace cleanup.
+	lttng/tracepoint.h \
+	lttng/tracepoint-rcu.h \
+	lttng/tracepoint-types.h \
+	lttng/tracepoint-event.h \
+	lttng/ust-tracepoint-event.h \
+	lttng/ust-tracepoint-event-reset.h \
+	lttng/ust-tracepoint-event-write.h \
+	lttng/ust-tracepoint-event-nowrite.h \
+	lttng/ust-arch.h \
+	lttng/ust-events.h \
+	lttng/ust-ctl.h \
+	lttng/ust-abi.h \
+	lttng/ringbuffer-abi.h \
+	lttng/ust-tracer.h \
+	lttng/ust-compiler.h \
+	lttng/ust.h \
+	lttng/ust-endian.h \
+	lttng/ringbuffer-context.h \
+	lttng/ust-align.h \
+	lttng/ust-bug.h \
+	lttng/ust-error.h \
+	lttng/tracef.h \
+	lttng/tp/lttng-ust-tracef.h \
+	lttng/tracelog.h \
+	lttng/tp/lttng-ust-tracelog.h \
+	lttng/ust-clock.h \
+	lttng/ust-getcpu.h \
+	lttng/ust-libc-wrapper.h \
+	lttng/urcu/pointer.h \
+	lttng/urcu/urcu-ust.h \
+	lttng/urcu/static/pointer.h \
+	lttng/urcu/static/urcu-ust.h
+
+# Auto-generated by configure.
+nobase_nodist_include_HEADERS = \
+	lttng/ust-config.h \
+	lttng/ust-version.h
+
+
+###                        ###
+### Global private headers ###
+###                        ###
 
 noinst_HEADERS = \
-	usterr.h \
-	ust_snprintf.h \
-	ust/compat.h \
-	ust/marker-internal.h \
-	ust/tracepoint-internal.h \
-	ust/clock.h \
-	ust/probe-internal.h \
-	ust/kcompat/kcompat.h \
-	ust/kcompat/jhash.h \
-	ust/kcompat/compiler.h \
-	ust/kcompat/types.h \
-	ust/stringify.h \
-	ust/wait.h \
-	ust/ringbuffer-config.h \
-	ust/processor.h
+	usterr-signal-safe.h \
+	ust-snprintf.h \
+	ust-bitmap.h \
+	ust-comm.h \
+	ust-compat.h \
+	ust-elf.h \
+	ust-tid.h \
+	ust-bitfield.h \
+	ust-dlfcn.h \
+	ust-dynamic-type.h \
+	ust-helper.h \
+	ust-share.h
+
+
+# These headers should be moved to the public headers when tested and
+# documented. The symbols are still part of the ABI.
+
+# Used by the Java jni interface.
+noinst_HEADERS += \
+	ust-context-provider.h
+
+# Used by liblttng-ust-fd
+noinst_HEADERS += \
+	ust-fd.h