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

diff --git a/libust/Makefile.am b/libust/Makefile.am
index cb5dc129..dfd96361 100644
--- a/libust/Makefile.am
+++ b/libust/Makefile.am
@@ -1,30 +1,27 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libustcomm
+AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = -fno-strict-aliasing
 
 lib_LTLIBRARIES = libust.la
 
 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 \
-	tracerconst.h \
-	header-inline.h
+	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 \
-	$(top_builddir)/snprintf/libustsnprintf.la \
-	$(top_builddir)/libustcomm/libustcomm.la
+	-lrt \
+	$(top_builddir)/snprintf/libustsnprintf.la
 
-libust_la_CFLAGS = -DUST_COMPONENT="libust"
+libust_la_CFLAGS = -DUST_COMPONENT="libust" -fno-strict-aliasing