X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2FMakefile.am;h=4d4761d911aff407429b1a917aded656d6bca0d7;hb=b1d36dcecece5826b07504fae171e76be800b4ef;hp=9c1a72285857623beeb186d4eeb33518f69401f0;hpb=4ab44fbe7377ad603da7dccebf2e0af6b768fa91;p=lttng-ust.git

diff --git a/include/Makefile.am b/include/Makefile.am
index 9c1a7228..4d4761d9 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,41 +1,74 @@
+# SPDX-License-Identifier: LGPL-2.1-only
+
+###                    ###
+### Public API headers ###
+###                    ###
+
 nobase_include_HEADERS = \
-	lttng/marker.h \
 	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/version.h \
 	lttng/ust-abi.h \
 	lttng/ringbuffer-abi.h \
 	lttng/ust-tracer.h \
-	lttng/usterr-signal-safe.h \
-	lttng/config.h \
-	lttng/share.h \
-	lttng/ust.h \
-	lttng/core.h \
-	lttng/processor.h \
-	lttng/kcompat/kcompat.h \
-	lttng/kcompat/jhash.h \
-	lttng/kcompat/compiler.h \
-	lttng/kcompat/types.h \
-	lttng/ringbuffer-config.h \
-	lttng/align.h \
-	lttng/bug.h \
-	lttng/vatomic.h
-
-# note: usterr-signal-safe.h, core.h and share.h need namespace cleanup.
+	lttng/ust-compiler.h \
+	lttng/ust-fork.h \
+	lttng/ust-endian.h \
+	lttng/ringbuffer-context.h \
+	lttng/ust-utils.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 \
-	lttng/ust-comm.h \
-	lttng/compat.h \
-	lttng/marker-internal.h \
-	lttng/clock.h \
-	lttng/probe-internal.h \
-	lttng/stringify.h \
-	lttng/wait.h \
-	lttng/bitfield.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