X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2FMakefile.am;h=dfd96361bb1ccc8cd477f8f15e7e2c80930e035e;hb=403c40b4b90356fddbb18cd12c6e6891c8bd317b;hp=6cd09165dbb3bf72d5506b89431e864501005d64;hpb=5f118a1c28ec1a3b4ad0dc847dac9636ce69852d;p=lttng-ust.git

diff --git a/libust/Makefile.am b/libust/Makefile.am
index 6cd09165..dfd96361 100644
--- a/libust/Makefile.am
+++ b/libust/Makefile.am
@@ -1,9 +1,27 @@
-INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libustcomm
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = -fno-strict-aliasing
 
 lib_LTLIBRARIES = libust.la
-libust_la_SOURCES = buffer.h 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.h
+
+libust_la_SOURCES = \
+	tracepoint.c \
+	trace_event.c \
+	ltt-tracer.h \
+	ltt-tracer-core.h \
+	ltt-ring-buffer-client.h \
+	ltt-ring-buffer-client-discard.c \
+	ltt-ring-buffer-client-overwrite.c \
+	ltt-ring-buffer-metadata-client.h \
+	ltt-ring-buffer-metadata-client.c \
+	ltt-events.c
+
+#removed: buffers.c buffers.h
+
 libust_la_LDFLAGS = -no-undefined -version-info 0:0:0
-libust_la_LIBADD = -lpthread
-libust_la_CFLAGS = -DUST_COMPONENT="libust"
 
-include_HEADERS = marker.h tracepoint.h immediate.h
+libust_la_LIBADD = \
+	-lpthread \
+	-lrt \
+	$(top_builddir)/snprintf/libustsnprintf.la
+
+libust_la_CFLAGS = -DUST_COMPONENT="libust" -fno-strict-aliasing