X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2FMakefile.am;h=4a9e6d39aafec8162caba3c7888ee065b67cd31f;hb=ae4b659d95f8dab9f2aa4b890d6937d7d5375f07;hp=76c8cf6fc20d4eda6c88f33e0eac0856969ce049;hpb=9f3fdbc68877e1f12b6cedb15ef76d9af9b48bac;p=lttng-ust.git

diff --git a/include/Makefile.am b/include/Makefile.am
index 76c8cf6f..4a9e6d39 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,28 +1,66 @@
+# SPDX-License-Identifier: LGPL-2.1-only
+
+###                    ###
+### Public API headers ###
+###                    ###
+
 nobase_include_HEADERS = \
-	ust/marker.h \
-	ust/tracepoint.h \
-	ust/tracepoint_event.h \
-	ust/probe.h \
-	ust/version.h \
-	ust/lttng-ust-abi.h \
-	ust/ringbuffer-abi.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-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-config.h \
+	lttng/align.h \
+	lttng/bug.h \
+	lttng/ust-error.h \
+	lttng/tracef.h \
+	lttng/lttng-ust-tracef.h \
+	lttng/tracelog.h \
+	lttng/lttng-ust-tracelog.h \
+	lttng/ust-clock.h \
+	lttng/ust-getcpu.h \
+	lttng/ust-elf.h \
+	lttng/counter-config.h \
+	lttng/bitmap.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 ###
+###                        ###
+
+# note: usterr-signal-safe.h, core.h and share.h need namespace cleanup.
 
 noinst_HEADERS = \
-	share.h \
-	usterr.h \
+	usterr-signal-safe.h \
 	ust_snprintf.h \
-	usterr_signal_safe.h \
-	ust/compat.h \
-	ust/config.h \
-	ust/core.h \
-	ust/marker-internal.h \
-	ust/tracepoint-internal.h \
-	ust/clock.h \
-	ust/probe-internal.h \
-	ust/processor.h \
-	ust/kcompat/kcompat.h \
-	ust/kcompat/jhash.h \
-	ust/kcompat/compiler.h \
-	ust/kcompat/types.h \
-	ust/tracectl.h \
-	ust/stringify.h
+	ust-comm.h \
+	ust-fd.h \
+	ust-tid.h \
+	ust-bitfield.h \
+	ust-dlfcn.h \
+	ust-dynamic-type.h \
+	ust-context-provider.h \
+	helper.h \
+	share.h
+