X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2FMakefile.am;h=3995b2f7650909da5f22d91fd8b6c44e0124bf0b;hb=d73bf3d793ee0b0c5b56cb47cb50c27d1789d3bd;hp=bdba28f19f2fadcc851babfa11ef950a2d3ae518;hpb=287a512f2b868c16132b894a8143a5faf0379ca8;p=lttng-tools.git

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index bdba28f19..3995b2f76 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,5 +1,3 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-
 AUTOMAKE_OPTIONS = subdir-objects
 
 SUBDIRS = string-utils
@@ -58,8 +56,6 @@ if BUILD_LIB_CONSUMER
 SUBDIRS += consumer
 endif
 
-AM_CFLAGS = -fno-strict-aliasing
-
 noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h futex.h \
 				 uri.h utils.h lttng-kernel-old.h \
 				 align.h bitfield.h bug.h time.h
@@ -82,13 +78,8 @@ libcommon_la_SOURCES = error.h error.c utils.c utils.h runas.c runas.h \
                        waiter.h waiter.c
 
 libcommon_la_LIBADD = \
-		$(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
+		$(top_builddir)/src/common/config/libconfig.la \
+		$(UUID_LIBS)
 
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \