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

diff --git a/include/Makefile.am b/include/Makefile.am
index 4a9e6d39..4d4761d9 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -13,27 +13,25 @@ nobase_include_HEADERS = \
 	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-fork.h \
 	lttng/ust-endian.h \
-	lttng/ringbuffer-config.h \
-	lttng/align.h \
-	lttng/bug.h \
+	lttng/ringbuffer-context.h \
+	lttng/ust-utils.h \
 	lttng/ust-error.h \
 	lttng/tracef.h \
-	lttng/lttng-ust-tracef.h \
+	lttng/tp/lttng-ust-tracef.h \
 	lttng/tracelog.h \
-	lttng/lttng-ust-tracelog.h \
+	lttng/tp/lttng-ust-tracelog.h \
 	lttng/ust-clock.h \
 	lttng/ust-getcpu.h \
-	lttng/ust-elf.h \
-	lttng/counter-config.h \
-	lttng/bitmap.h \
+	lttng/ust-libc-wrapper.h \
 	lttng/urcu/pointer.h \
 	lttng/urcu/urcu-ust.h \
 	lttng/urcu/static/pointer.h \
@@ -49,18 +47,28 @@ nobase_nodist_include_HEADERS = \
 ### Global private headers ###
 ###                        ###
 
-# note: usterr-signal-safe.h, core.h and share.h need namespace cleanup.
-
 noinst_HEADERS = \
 	usterr-signal-safe.h \
-	ust_snprintf.h \
+	ust-snprintf.h \
+	ust-bitmap.h \
 	ust-comm.h \
-	ust-fd.h \
+	ust-compat.h \
+	ust-elf.h \
 	ust-tid.h \
 	ust-bitfield.h \
 	ust-dlfcn.h \
 	ust-dynamic-type.h \
-	ust-context-provider.h \
-	helper.h \
-	share.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