X-Git-Url: https://git.lttng.org/?p=ust.git;a=blobdiff_plain;f=libust%2FMakefile.am;h=529d4b0cdd704e2f6abd483c70abef3c5d5e5a53;hp=60687a90ed04a7a11499f6f06d45b0afdd77e5db;hb=16c83055d749e9f246a934401e3862085aca1e65;hpb=afa28e0364b5132f3473ff08d9bca2026e723b41

diff --git a/libust/Makefile.am b/libust/Makefile.am
index 60687a9..529d4b0 100644
--- a/libust/Makefile.am
+++ b/libust/Makefile.am
@@ -1,9 +1,32 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libustcomm
+AM_CFLAGS = -fno-strict-aliasing
+
 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/multipoll.c \
+	tracerconst.h \
+	header-inline.h
+
 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 \
+	$(top_builddir)/snprintf/libustsnprintf.la \
+	$(top_builddir)/libustcomm/libustcomm.la
+
+libust_la_CFLAGS = -DUST_COMPONENT="libust" -fno-strict-aliasing