X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2FMakefile.am;h=3caaa1fd74d9d1390412b6b6e9916647de6d7e05;hb=e450e3396b0bfe998e3bde6aef7dc3b4232f8edb;hp=3f4c023db24acaaf646259982dfcacd0491ed92e;hpb=cefef7a70a723c31ab6a0746c7611f145337dabe;p=lttng-ust.git

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 3f4c023d..3caaa1fd 100644
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
-AM_CFLAGS += -fno-strict-aliasing
+AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing
 
 noinst_LTLIBRARIES = liblttng-ust-runtime.la liblttng-ust-support.la
 
@@ -14,8 +13,7 @@ liblttng_ust_tracepoint_la_SOURCES = \
 	error.h
 
 liblttng_ust_tracepoint_la_LIBADD = \
-	-lurcu-bp \
-	-lpthread \
+	$(URCU_BP_LIBS) \
 	$(top_builddir)/snprintf/libustsnprintf.la \
 	$(DL_LIBS)
 
@@ -110,9 +108,8 @@ liblttng_ust_support_la_LIBADD = \
 	$(top_builddir)/libringbuffer/libringbuffer.la
 
 liblttng_ust_la_LIBADD = \
-	-lpthread \
 	-lrt \
-	-lurcu-cds \
+	$(URCU_CDS_LIBS) \
 	$(top_builddir)/snprintf/libustsnprintf.la \
 	$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
 	liblttng-ust-tracepoint.la \