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

diff --git a/include/Makefile.am b/include/Makefile.am
index 4a9e6d39..d29ef192 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -33,7 +33,6 @@ nobase_include_HEADERS = \
 	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 \
@@ -49,18 +48,27 @@ 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-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