X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2FMakefile.am;h=4a0a4ba6c83be593078210954d3ac638ae861f24;hb=b728d87e617189fe9898a9492a559ecf949d2348;hp=d3869ab9561d952e09d9744b25f8461e38fa7ebc;hpb=57773204abc43ed7d4350ac0d641ddbbda1e441e;p=lttng-ust.git

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