X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2FMakefile.am;h=628e56fba9043f700580101bbc055db81a148501;hb=19d8b1b3cecac9a52cf8e0e381854703c141ec5e;hp=9d9477b9eaad88f84c463b2d8359cb00d9c12f1c;hpb=5e8445c48358d4d943c61e5cd94429fc75047d63;p=lttng-ust.git

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 9d9477b9..628e56fb 100644
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -33,7 +33,8 @@ liblttng_ust_runtime_la_SOURCES = \
 	compat.h \
 	wait.h \
 	jhash.h \
-	error.h
+	error.h \
+	uuid.h
 
 liblttng_ust_support_la_SOURCES = \
 	ltt-tracer.h \
@@ -55,10 +56,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