X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2FMakefile.am;h=087dc0a978a3475ae56ef799243a1d09ddbea4db;hb=b5b073e22d34bec71259d39b8946354f170f01a9;hp=60687a90ed04a7a11499f6f06d45b0afdd77e5db;hpb=afa28e0364b5132f3473ff08d9bca2026e723b41;p=ust.git

diff --git a/libust/Makefile.am b/libust/Makefile.am
index 60687a9..087dc0a 100644
--- a/libust/Makefile.am
+++ b/libust/Makefile.am
@@ -1,9 +1,7 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libustcomm
+
 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_SOURCES = marker.c tracepoint.c channels.c channels.h marker-control.c marker-control.h buffers.c buffers.h tracer.c tracer.h tracercore.c tracercore.h serialize.c tracectl.c $(top_builddir)/libustcomm/ustcomm.c
 libust_la_LDFLAGS = -no-undefined -version-info 0:0:0
-libust_la_LIBADD = @URCU_PATH@@URCU_LIB@ -lpthread
-
-INCLUDES = -I$(top_builddir)/share
-INCLUDES += -I$(top_builddir)/libustcomm
-INCLUDES += -I@URCU_PATH@
-INCLUDES += -I@KCOMPAT_PATH@
+libust_la_LIBADD = -lpthread
+libust_la_CFLAGS = -DUST_COMPONENT="libust"