X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2FMakefile.am;h=bfddd3aa9fdb91a772caa97af04869f6625f6267;hb=9f3fdbc68877e1f12b6cedb15ef76d9af9b48bac;hp=0faa8c01aeffac0e342d818f9db12c942a1b222f;hpb=55355fa5bb062aeb705e808642bf953d9de9b3ba;p=lttng-ust.git

diff --git a/libust/Makefile.am b/libust/Makefile.am
index 0faa8c01..bfddd3aa 100644
--- a/libust/Makefile.am
+++ b/libust/Makefile.am
@@ -1,7 +1,26 @@
-INCLUDES = -I$(top_builddir)/share -I$(top_builddir)/libustcomm \
-	$(KCOMPAT_CFLAGS) $(URCU_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/include
+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 = \
+	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
+
+#removed: buffers.c buffers.h
+
 libust_la_LDFLAGS = -no-undefined -version-info 0:0:0
-libust_la_LIBADD = $(URCU_LIBS) -lpthread
+
+libust_la_LIBADD = \
+	-lpthread \
+	-lrt \
+	$(top_builddir)/snprintf/libustsnprintf.la
+
+libust_la_CFLAGS = -DUST_COMPONENT="libust" -fno-strict-aliasing