X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2FMakefile.am;h=3a667956a3db3554b8dfc6cfc37640f05df126d9;hb=51489cadd9c38c10261bdbab9b5e72803c95a732;hp=9385364217c32ab2224ee45663259fdfefe27d98;hpb=0a42beb627df1b9ea5cce4b1908e8a9cefaa1631;p=lttng-ust.git

diff --git a/include/Makefile.am b/include/Makefile.am
index 93853642..3a667956 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,31 +1,42 @@
 nobase_include_HEADERS = \
-	ust/marker.h \
-	ust/tracepoint.h \
-	ust/tracepoint-event.h \
-	ust/lttng-tracepoint-event.h \
-	ust/lttng-tracepoint-event-reset.h \
-	ust/lttng-events.h \
-	ust/version.h \
-	ust/lttng-ust-abi.h \
-	ust/ringbuffer-abi.h
+	lttng/marker.h \
+	lttng/tracepoint.h \
+	lttng/tracepoint-types.h \
+	lttng/tracepoint-event.h \
+	lttng/ust-tracepoint-event.h \
+	lttng/ust-tracepoint-event-reset.h \
+	lttng/ust-events.h \
+	lttng/ust-ctl.h \
+	lttng/version.h \
+	lttng/ust-abi.h \
+	lttng/ust-comm.h \
+	lttng/ringbuffer-abi.h \
+	lttng/ust-tracer.h \
+	lttng/usterr-signal-safe.h \
+	lttng/config.h \
+	lttng/share.h \
+	lttng/ust.h \
+	lttng/core.h \
+	lttng/processor.h \
+	lttng/kcompat/kcompat.h \
+	lttng/kcompat/jhash.h \
+	lttng/kcompat/compiler.h \
+	lttng/kcompat/types.h \
+	lttng/ringbuffer-config.h \
+	lttng/align.h \
+	lttng/bug.h \
+	lttng/vatomic.h
+
+# note: usterr-signal-safe.h, core.h and share.h need namespace cleanup.
 
 noinst_HEADERS = \
-	share.h \
 	usterr.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/wait.h
+	lttng/compat.h \
+	lttng/marker-internal.h \
+	lttng/tracepoint-internal.h \
+	lttng/clock.h \
+	lttng/probe-internal.h \
+	lttng/stringify.h \
+	lttng/wait.h \
+	lttng/bitfield.h