X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2FMakefile.am;h=9583c8b6d7d9dd2dcc5ce4226c9b700fefc683c7;hb=ed6dd5d6d9f0ddccd1a09afea5398705bb934048;hp=2c78459efc2813b9bf760834e256bd7e9018d22e;hpb=cd61d9bfa5fd334b086831dcbdec63da6c0d1a16;p=lttng-ust.git

diff --git a/include/Makefile.am b/include/Makefile.am
index 2c78459e..9583c8b6 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -13,6 +13,7 @@ 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 \
@@ -21,18 +22,17 @@ nobase_include_HEADERS = \
 	lttng/ust-compiler.h \
 	lttng/ust.h \
 	lttng/ust-endian.h \
-	lttng/ringbuffer-config.h \
-	lttng/align.h \
-	lttng/bug.h \
+	lttng/ringbuffer-context.h \
+	lttng/ust-align.h \
+	lttng/ust-bug.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/ust-libc-wrapper.h \
 	lttng/urcu/pointer.h \
 	lttng/urcu/urcu-ust.h \
 	lttng/urcu/static/pointer.h \
@@ -48,15 +48,13 @@ nobase_nodist_include_HEADERS = \
 ### Global private headers ###
 ###                        ###
 
-# note: usterr-signal-safe.h need namespace cleanup.
-
 noinst_HEADERS = \
 	usterr-signal-safe.h \
 	ust-snprintf.h \
 	ust-bitmap.h \
 	ust-comm.h \
 	ust-compat.h \
-	ust-fd.h \
+	ust-elf.h \
 	ust-tid.h \
 	ust-bitfield.h \
 	ust-dlfcn.h \
@@ -64,7 +62,14 @@ noinst_HEADERS = \
 	ust-helper.h \
 	ust-share.h
 
-# Should be moved to the public headers when tested and documented. The symbols
-# are still part of the ABI and used by the Java jni interface.
+
+# 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