X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2FMakefile.am;h=a7edfd5c30291562d4ebb39a56674d5cfb78e385;hb=b2292d8567372f5bbadaeb0cd7b26e6fc4cd1b56;hp=f1801cf59e17f2cedbe9b4a09f65a55e724e9084;hpb=5517d34d4c242bb2a5233e08e21eec7fa12f3489;p=lttng-ust.git

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index f1801cf5..a7edfd5c 100644
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
-AM_CFLAGS = -fno-strict-aliasing
+AM_CFLAGS += -fno-strict-aliasing
 
 noinst_LTLIBRARIES = liblttng-ust-runtime.la liblttng-ust-support.la
 
@@ -14,9 +14,10 @@ liblttng_ust_tracepoint_la_SOURCES = \
 	error.h
 liblttng_ust_tracepoint_la_LIBADD = \
 	-lurcu-bp \
+	-lpthread \
 	$(top_builddir)/snprintf/libustsnprintf.la
 liblttng_ust_tracepoint_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
-liblttng_ust_tracepoint_la_CFLAGS = -DUST_COMPONENT="liblttng_ust_tracepoint" -fno-strict-aliasing
+liblttng_ust_tracepoint_la_CFLAGS = -DUST_COMPONENT="liblttng_ust_tracepoint" $(AM_CFLAGS)
 
 liblttng_ust_runtime_la_SOURCES = \
 	lttng-ust-comm.c \
@@ -42,6 +43,8 @@ liblttng_ust_runtime_la_SOURCES = \
 	lttng-ust-statedump.c \
 	lttng-ust-statedump.h \
 	lttng-ust-statedump-provider.h \
+	ust_lib.c \
+	ust_lib.h \
 	tracepoint-internal.h \
 	clock.h \
 	compat.h \
@@ -53,17 +56,24 @@ liblttng_ust_runtime_la_SOURCES = \
 	lttng-ust-tracef-provider.h \
 	tracelog.c \
 	lttng-ust-tracelog-provider.h \
-	getenv.h
+	getenv.h \
+	string-utils.c \
+	string-utils.h
+
+liblttng_ust_runtime_la_CFLAGS = -DLTTNG_UST_LIBRARY_VERSION_MAJOR=\"$(LTTNG_UST_LIBRARY_VERSION_MAJOR)\"
 
 if HAVE_PERF_EVENT
 liblttng_ust_runtime_la_SOURCES += \
-	lttng-context-perf-counters.c
+	lttng-context-perf-counters.c \
+	perf_event.h
 endif
 
 liblttng_ust_support_la_SOURCES = \
 	lttng-tracer.h \
 	lttng-tracer-core.h \
 	ust-core.c \
+	getenv.h \
+	getenv.c \
 	lttng-ust-dynamic-type.c \
 	lttng-rb-clients.h \
 	lttng-ring-buffer-client.h \
@@ -92,4 +102,4 @@ liblttng_ust_la_LIBADD = \
 	liblttng-ust-tracepoint.la \
 	liblttng-ust-runtime.la liblttng-ust-support.la
 
-liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" -fno-strict-aliasing
+liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" $(AM_CFLAGS)