X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-fd%2FMakefile.am;h=a0e6c36cdf1c2f4401a91846edd65e1ac0c5d519;hb=60b488d313c3128b0214ec3ed331603c022e37ba;hp=52f897d687137fe449488a8348eda74bc16eb4e2;hpb=95e6d2685eec83a144f533a447ffd355fadf9d79;p=lttng-ust.git

diff --git a/liblttng-ust-fd/Makefile.am b/liblttng-ust-fd/Makefile.am
index 52f897d6..a0e6c36c 100644
--- a/liblttng-ust-fd/Makefile.am
+++ b/liblttng-ust-fd/Makefile.am
@@ -1,10 +1,11 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
-AM_CFLAGS = -fno-strict-aliasing
+AM_CFLAGS += -fno-strict-aliasing
 
 lib_LTLIBRARIES = liblttng-ust-fd.la
 liblttng_ust_fd_la_SOURCES = \
 	lttng-ust-fd.c
 liblttng_ust_fd_la_LIBADD = \
+	$(top_builddir)/liblttng-ust/liblttng-ust.la
 	$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la
 
 if LTTNG_UST_BUILD_WITH_LIBDL
@@ -14,4 +15,4 @@ if LTTNG_UST_BUILD_WITH_LIBC_DL
 liblttng_ust_fd_la_LIBADD += -lc
 endif
 
-liblttng_ust_fd_la_CFLAGS = -DUST_COMPONENT=liblttng-ust-fd -fno-strict-aliasing
+liblttng_ust_fd_la_CFLAGS = -DUST_COMPONENT=liblttng-ust-fd $(AM_CFLAGS)