X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=37c451a45e1f5734aedba1436a5f66c8297f3d51;hb=389fbf04b41e2002be44a1e3392bfade2f1deeef;hp=c1b9d4e7a36f35d1e0c2b43712ba5b962ddbf044;hpb=654f9f5e49aae2669d8ae771650b5e2dce5d660f;p=lttng-tools.git

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index c1b9d4e7a..37c451a45 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -72,13 +72,18 @@ libcommon_la_SOURCES = error.h error.c utils.c utils.h runas.c runas.h \
                        pipe.c pipe.h readwrite.c readwrite.h \
                        mi-lttng.h mi-lttng.c \
                        daemonize.c daemonize.h \
-                       sessiond-comm/unix.c sessiond-comm/unix.h \
+                       unix.c unix.h \
                        filter.c filter.h context.c context.h
 
 libcommon_la_LIBADD = \
-		-luuid \
 		-lrt \
 		$(top_builddir)/src/common/config/libconfig.la
+if LTTNG_BUILD_WITH_LIBUUID
+libcommon_la_LIBADD += -luuid
+endif
+if LTTNG_BUILD_WITH_LIBC_UUID
+libcommon_la_LIBADD += -lc
+endif
 
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \