Namespace lttng/bug.h as lttng/ust-bug.h

[lttng-ust.git] / include / Makefile.am

diff --git a/include/Makefile.am b/include/Makefile.am
index cafcb7c7cb062f4d8ca6ed807f9c0fd2758ad488..a113bf1307354a5cd60f0ad6ea68ed1ac6a03f12 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -21,9 +21,9 @@ nobase_include_HEADERS = \
        lttng/ust-compiler.h \
        lttng/ust.h \
        lttng/ust-endian.h \
-       lttng/ringbuffer-config.h \
+       lttng/ringbuffer-context.h \
        lttng/align.h \
-       lttng/bug.h \
+       lttng/ust-bug.h \
        lttng/ust-error.h \
        lttng/tracef.h \
        lttng/lttng-ust-tracef.h \
@@ -31,9 +31,7 @@ nobase_include_HEADERS = \
        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/ust-libc-wrapper.h \
        lttng/urcu/pointer.h \
        lttng/urcu/urcu-ust.h \
        lttng/urcu/static/pointer.h \
@@ -49,13 +47,13 @@ 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-bitmap.h \
        ust-comm.h \
-       ust-fd.h \
+       ust-compat.h \
+       ust-elf.h \
        ust-tid.h \
        ust-bitfield.h \
        ust-dlfcn.h \
@@ -63,7 +61,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