X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2FMakefile.am;h=36cb9a25038f0d871f40577bf5c40afc6b4f0f3e;hb=dc58067e5a8b6717acd5c2d9031755aeb67e7cc1;hp=9d9477b9eaad88f84c463b2d8359cb00d9c12f1c;hpb=578ce73a104b847b78790041bf30aa9aaa310dd0;p=lttng-ust.git

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 9d9477b9..36cb9a25 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
@@ -12,7 +12,10 @@ liblttng_ust_tracepoint_la_SOURCES = \
 	jhash.h \
 	error.h
 liblttng_ust_tracepoint_la_LIBADD = \
-	-lurcu-bp
+	-lurcu-bp \
+	$(top_builddir)/snprintf/libustsnprintf.la \
+	liblttng-ust-support.la
+
 liblttng_ust_tracepoint_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
 liblttng_ust_tracepoint_la_CFLAGS = -DUST_COMPONENT="liblttng_ust_tracepoint" -fno-strict-aliasing
 
@@ -33,7 +36,8 @@ liblttng_ust_runtime_la_SOURCES = \
 	compat.h \
 	wait.h \
 	jhash.h \
-	error.h
+	error.h \
+	lttng-ust-uuid.h
 
 liblttng_ust_support_la_SOURCES = \
 	ltt-tracer.h \
@@ -55,10 +59,16 @@ liblttng_ust_support_la_LIBADD = \
 liblttng_ust_la_LIBADD = \
 	-lpthread \
 	-lrt \
-	-luuid \
 	-llttng-ust-tracepoint \
 	$(top_builddir)/snprintf/libustsnprintf.la \
 	$(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