X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2FMakefile.am;h=9d9477b9eaad88f84c463b2d8359cb00d9c12f1c;hb=545c85f844ecc49a62c6889e73d0bc466b8e6935;hp=75a2ba8ab19932ef4782d37ae48a85f103cceb5f;hpb=f194f3b00d042154c35f1f9ec262e25f2cd83b8a;p=lttng-ust.git

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