Commit changes prior to shmp read-only header

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

diff --git a/libust/Makefile.am b/libust/Makefile.am
index 612ac93a2b7a3cc83c169ae06a94a0f35b4662cc..7e5a0df98defbb0db401a933d187e7b0c0ad0b6a 100644 (file)
--- a/libust/Makefile.am
+++ b/libust/Makefile.am
@@ -1,24 +1,28 @@
-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/ustcomm.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 \
+       lttng-ust-abi.c
+
+#removed: buffers.c buffers.h
+
 libust_la_LDFLAGS = -no-undefined -version-info 0:0:0
-libust_la_LIBADD = -lpthread
-libust_la_CFLAGS = -DUST_COMPONENT="libust"
+
+libust_la_LIBADD = \
+       -lpthread \
+       -lrt \
+       $(top_builddir)/snprintf/libustsnprintf.la
+
+libust_la_CFLAGS = -DUST_COMPONENT="libust" -fno-strict-aliasing