Rename sessiond comm lib into ust comm

[lttng-ust.git] / libust / Makefile.am

diff --git a/libust/Makefile.am b/libust/Makefile.am
index b4d059803fa5deb1078ac845068bf9ad5360ca75..0a6834ae245f784e78b46d8950c32bdc73245102 100644 (file)
--- a/libust/Makefile.am
+++ b/libust/Makefile.am
@@ -1,31 +1,34 @@
-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 \
-       $(top_builddir)/libustcomm/multipoll.c \
-       tracerconst.h \
-       header-inline.h
+       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 = \
        -lpthread \
+       -lrt \
+       -luuid \
        $(top_builddir)/snprintf/libustsnprintf.la \
-       $(top_builddir)/libustcomm/libustcomm.la
+       $(top_builddir)/libringbuffer/libringbuffer.la \
+       $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la
 
-libust_la_CFLAGS = -DUST_COMPONENT="libust"
+libust_la_CFLAGS = -DUST_COMPONENT="libust" -fno-strict-aliasing