X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=liblttng-ust%2FMakefile.am;h=fab09251396a448d79e660f0b86833012b1cc6a2;hb=ebabbf580131acd1fe246c4d31fc5c044d36a038;hp=abb7a8dc4154166f85ffb4c40e2c5239b89cbe49;hpb=fca2f1916cd9f22f410d8f22b9a0720c978c2025;p=deliverable%2Flttng-ust.git

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index abb7a8dc..fab09251 100644
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
-AM_CFLAGS += -fno-strict-aliasing
+AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing
 
 noinst_LTLIBRARIES = liblttng-ust-runtime.la liblttng-ust-support.la
 
@@ -14,8 +13,7 @@ liblttng_ust_tracepoint_la_SOURCES = \
 	error.h
 
 liblttng_ust_tracepoint_la_LIBADD = \
-	-lurcu-bp \
-	-lpthread \
+	$(URCU_BP_LIBS) \
 	$(top_builddir)/snprintf/libustsnprintf.la \
 	$(DL_LIBS)
 
@@ -23,9 +21,15 @@ liblttng_ust_tracepoint_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIB
 liblttng_ust_tracepoint_la_CFLAGS = -DUST_COMPONENT="liblttng_ust_tracepoint" $(AM_CFLAGS)
 
 liblttng_ust_runtime_la_SOURCES = \
+	bytecode.h \
 	lttng-ust-comm.c \
 	lttng-ust-abi.c \
 	lttng-probes.c \
+	lttng-bytecode.c \
+	lttng-bytecode.h \
+	lttng-bytecode-validator.c \
+	lttng-bytecode-specialize.c \
+	lttng-bytecode-interpreter.c \
 	lttng-context-provider.c \
 	lttng-context-vtid.c \
 	lttng-context-vpid.c \
@@ -38,6 +42,7 @@ liblttng_ust_runtime_la_SOURCES = \
 	lttng-context-mnt-ns.c \
 	lttng-context-net-ns.c \
 	lttng-context-pid-ns.c \
+	lttng-context-time-ns.c \
 	lttng-context-user-ns.c \
 	lttng-context-uts-ns.c \
 	lttng-context-vuid.c \
@@ -48,12 +53,6 @@ liblttng_ust_runtime_la_SOURCES = \
 	lttng-context-vsgid.c \
 	lttng-context.c \
 	lttng-events.c \
-	lttng-filter.c \
-	lttng-filter.h \
-	lttng-filter-validator.c \
-	lttng-filter-specialize.c \
-	lttng-filter-interpreter.c \
-	filter-bytecode.h \
 	lttng-hash-helper.h \
 	lttng-ust-elf.c \
 	lttng-ust-statedump.c \
@@ -61,7 +60,10 @@ liblttng_ust_runtime_la_SOURCES = \
 	lttng-ust-statedump-provider.h \
 	ust_lib.c \
 	ust_lib.h \
+	context-internal.h \
+	context-provider-internal.h \
 	tracepoint-internal.h \
+	ust-events-internal.h \
 	clock.h \
 	compat.h \
 	wait.h \
@@ -75,6 +77,7 @@ liblttng_ust_runtime_la_SOURCES = \
 	getenv.h \
 	string-utils.c \
 	string-utils.h \
+	event-notifier-notification.c \
 	ns.h \
 	creds.h
 
@@ -99,6 +102,8 @@ liblttng_ust_support_la_SOURCES = \
 	lttng-ring-buffer-client-overwrite-rt.c \
 	lttng-ring-buffer-metadata-client.h \
 	lttng-ring-buffer-metadata-client.c \
+	lttng-counter-client-percpu-32-modular.c \
+	lttng-counter-client-percpu-64-modular.c \
 	lttng-clock.c lttng-getcpu.c
 
 liblttng_ust_la_SOURCES =
@@ -106,16 +111,17 @@ liblttng_ust_la_SOURCES =
 liblttng_ust_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
 
 liblttng_ust_support_la_LIBADD = \
-	$(top_builddir)/libringbuffer/libringbuffer.la
+	$(top_builddir)/libringbuffer/libringbuffer.la \
+	$(top_builddir)/libcounter/libcounter.la
 
 liblttng_ust_la_LIBADD = \
-	-lpthread \
 	-lrt \
-	-lurcu-cds \
+	$(URCU_CDS_LIBS) \
 	$(top_builddir)/snprintf/libustsnprintf.la \
 	$(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \
 	liblttng-ust-tracepoint.la \
 	liblttng-ust-runtime.la liblttng-ust-support.la \
+	$(top_builddir)/libmsgpack/libmsgpack.la \
 	$(DL_LIBS)
 
 liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" $(AM_CFLAGS)