X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2FMakefile.am;h=86661c6bdb9cefb62685eb7c8d7280c68422bab4;hb=74d81a6cca2cd4a7718bba9368f382f9f2fbba84;hp=aeb5092f7dde7d0847bad0d05ee3996219ed84ec;hpb=b9d1a0083deb8ae2deb9e24a167590b70aec1b72;p=lttng-ust.git

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index aeb5092f..86661c6b 100644
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 AM_CFLAGS = -fno-strict-aliasing
 
 noinst_LTLIBRARIES = liblttng-ust-runtime.la liblttng-ust-support.la
@@ -8,7 +8,7 @@ lib_LTLIBRARIES = liblttng-ust-tracepoint.la liblttng-ust.la
 liblttng_ust_tracepoint_la_SOURCES = \
 	tracepoint.c \
 	tracepoint-internal.h \
-	ltt-tracer-core.h \
+	lttng-tracer-core.h \
 	jhash.h \
 	error.h
 liblttng_ust_tracepoint_la_LIBADD = \
@@ -19,15 +19,15 @@ liblttng_ust_tracepoint_la_CFLAGS = -DUST_COMPONENT="liblttng_ust_tracepoint" -f
 liblttng_ust_runtime_la_SOURCES = \
 	lttng-ust-comm.c \
 	lttng-ust-abi.c \
-	ltt-probes.c \
+	lttng-probes.c \
 	probes/lttng-probe-ust.c \
 	probes/lttng-probe-ust.h \
 	lttng-context-vtid.c \
 	lttng-context-vpid.c \
 	lttng-context-pthread-id.c \
 	lttng-context-procname.c \
-	ltt-context.c \
-	ltt-events.c \
+	lttng-context.c \
+	lttng-events.c \
 	lttng-filter.c \
 	lttng-filter.h \
 	lttng-filter-validator.c \
@@ -40,18 +40,18 @@ liblttng_ust_runtime_la_SOURCES = \
 	compat.h \
 	wait.h \
 	jhash.h \
-	error.h \
-	lttng-ust-uuid.h
+	lttng-ust-uuid.h \
+	error.h
 
 liblttng_ust_support_la_SOURCES = \
-	ltt-tracer.h \
-	ltt-tracer-core.h \
+	lttng-tracer.h \
+	lttng-tracer-core.h \
 	ust-core.c \
-	ltt-ring-buffer-client.h \
-	ltt-ring-buffer-client-discard.c \
-	ltt-ring-buffer-client-overwrite.c \
-	ltt-ring-buffer-metadata-client.h \
-	ltt-ring-buffer-metadata-client.c
+	lttng-ring-buffer-client.h \
+	lttng-ring-buffer-client-discard.c \
+	lttng-ring-buffer-client-overwrite.c \
+	lttng-ring-buffer-metadata-client.h \
+	lttng-ring-buffer-metadata-client.c
 
 liblttng_ust_la_SOURCES =
 
@@ -69,11 +69,4 @@ liblttng_ust_la_LIBADD = \
 	$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
 	liblttng-ust-runtime.la liblttng-ust-support.la
 
-if LTTNG_UST_BUILD_WITH_LIBUUID
-liblttng_ust_la_LIBADD += -luuid
-endif
-if LTTNG_UST_BUILD_WITH_LIBC_UUID
-liblttng_ust_la_LIBADD += -lc
-endif
-
 liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" -fno-strict-aliasing