X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=libust%2FMakefile.am;h=0a6834ae245f784e78b46d8950c32bdc73245102;hb=b35d179d7be2ab0cb4a9c698b86d78928089fc39;hp=1f18f8b90adc396f614ff8f442a89e3ba8b0d3eb;hpb=2028e7fd97170e430b55b8c0e1a6ca1edca7680c;p=lttng-ust.git

diff --git a/libust/Makefile.am b/libust/Makefile.am
index 1f18f8b9..0a6834ae 100644
--- a/libust/Makefile.am
+++ b/libust/Makefile.am
@@ -1,8 +1,34 @@
-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/usterr.h localerr.h
+
+libust_la_SOURCES = \
+	tracepoint.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 \
+	ltt-context.c \
+	ltt-probes.c \
+	lttng-ust-abi.c \
+	lttng-ust-comm.c \
+	ust-core.c
+
+#removed: buffers.c buffers.h
+
 libust_la_LDFLAGS = -no-undefined -version-info 0:0:0
-libust_la_LIBADD = $(URCU_LIBS) -lpthread
-libust_la_CFLAGS = -DUST_COMPONENT="libust"
+
+libust_la_LIBADD = \
+	-lpthread \
+	-lrt \
+	-luuid \
+	$(top_builddir)/snprintf/libustsnprintf.la \
+	$(top_builddir)/libringbuffer/libringbuffer.la \
+	$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la
+
+libust_la_CFLAGS = -DUST_COMPONENT="libust" -fno-strict-aliasing