-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 = buffer.h marker.c tracepoint.c 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
+
+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 = -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