X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2FMakefile.am;h=d85cf60273120969d7a69015c3e33484c21e1eed;hb=53b9d7db85d4fafa5b8044a474bb84b8d80966ad;hp=3c7da7e6275ef8c979ce026f5675939219437c85;hpb=d9c56a93651a409c6ceea65ed1d7f33e3f5ee538;p=lttng-ust.git

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 3c7da7e6..d85cf602 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,7 +13,7 @@ liblttng_ust_tracepoint_la_SOURCES = \
 	error.h
 
 liblttng_ust_tracepoint_la_LIBADD = \
-	-lurcu-bp \
+	$(URCU_BP_LIBS) \
 	$(top_builddir)/snprintf/libustsnprintf.la \
 	$(DL_LIBS)
 
@@ -62,6 +61,7 @@ liblttng_ust_runtime_la_SOURCES = \
 	ust_lib.c \
 	ust_lib.h \
 	tracepoint-internal.h \
+	ust-events-internal.h \
 	clock.h \
 	compat.h \
 	wait.h \
@@ -110,7 +110,7 @@ liblttng_ust_support_la_LIBADD = \
 
 liblttng_ust_la_LIBADD = \
 	-lrt \
-	-lurcu-cds \
+	$(URCU_CDS_LIBS) \
 	$(top_builddir)/snprintf/libustsnprintf.la \
 	$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
 	liblttng-ust-tracepoint.la \