X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2FMakefile.am;h=67810642de6e1cdeeda78740342a1b58d73afd2a;hb=1e4316628fcd8b99f3497ef8b819368a9c65fad8;hp=d2a8187d12be77cf4bbdfcbe0855ea26d824ed24;hpb=b4512257eb71d0432554047acf6278dc42a15a75;p=lttng-ust.git

diff --git a/libust/Makefile.am b/libust/Makefile.am
index d2a8187d..67810642 100644
--- a/libust/Makefile.am
+++ b/libust/Makefile.am
@@ -1,9 +1,7 @@
-lib_LTLIBRARIES = libust.la
-libust_la_SOURCES = marker.c marker.h tracepoint.c tracepoint.h immediate.h channels.c channels.h marker-control.c marker-control.h relay.c relay.h tracer.c tracer.h tracercore.c tracercore.h serialize.c tracectl.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/share/kref.c $(top_builddir)/share/usterr.c
-libust_la_LIBADD = @URCU_PATH@/liburcu.so
-libust_la_LDFLAGS = -lpthread
+INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libustcomm \
+	$(KCOMPAT_CFLAGS) $(URCU_CFLAGS)
 
-INCLUDES = -I$(top_builddir)/share
-INCLUDES += -I$(top_builddir)/libustcomm
-INCLUDES += -I@URCU_PATH@
-INCLUDES += -I@KCOMPAT_PATH@
+lib_LTLIBRARIES = libust.la
+libust_la_SOURCES = marker.c marker.h tracepoint.c tracepoint.h immediate.h channels.c channels.h marker-control.c marker-control.h relay.c relay.h tracer.c tracer.h tracercore.c tracercore.h serialize.c tracectl.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/share/usterr.c $(top_builddir)/share/usterr.h localerr.h
+libust_la_LDFLAGS = -no-undefined -version-info 0:0:0
+libust_la_LIBADD = $(URCU_LIBS) -lpthread