X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2FMakefile.am;h=0aba5c53549776d09e002340f7c15d531246dc9d;hb=17dfb34b2e6613f3a6d2f084e2d78fe3c301ad98;hp=df5f46a4228247a68b594a813e4841a860259844;hpb=01377ba5ec3460a6886f3a16e52f7f956c8fb100;p=lttng-ust.git

diff --git a/libust/Makefile.am b/libust/Makefile.am
index df5f46a4..0aba5c53 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
+
+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 \
+	probes/lttng-probe-ust.c \
+	probes/lttng-probe-ust.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