X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2FMakefile.am;h=ca81ba6d4183e93cefa81d2f09dbf9e723ea5134;hb=3f38c6a3da61d0d66bb57475645103b8b4c6be4e;hp=d85cf60273120969d7a69015c3e33484c21e1eed;hpb=d871c65bcb2e94c69e0a46e7e0dcd2dae2fce7af;p=lttng-ust.git

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index d85cf602..ca81ba6d 100644
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -2,7 +2,13 @@ AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing
 
 noinst_LTLIBRARIES = liblttng-ust-runtime.la liblttng-ust-support.la
 
-lib_LTLIBRARIES = liblttng-ust-tracepoint.la liblttng-ust.la
+lib_LTLIBRARIES = liblttng-ust-common.la liblttng-ust-tracepoint.la liblttng-ust.la
+
+liblttng_ust_common_la_SOURCES = \
+	lttng-ust-urcu.c \
+	lttng-ust-urcu-pointer.c
+
+liblttng_ust_common_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
 
 liblttng_ust_tracepoint_la_SOURCES = \
 	tracepoint.c \
@@ -13,7 +19,7 @@ liblttng_ust_tracepoint_la_SOURCES = \
 	error.h
 
 liblttng_ust_tracepoint_la_LIBADD = \
-	$(URCU_BP_LIBS) \
+	liblttng-ust-common.la \
 	$(top_builddir)/snprintf/libustsnprintf.la \
 	$(DL_LIBS)
 
@@ -21,9 +27,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 \
@@ -47,12 +59,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 \
@@ -60,6 +66,8 @@ 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 \
@@ -75,8 +83,17 @@ liblttng_ust_runtime_la_SOURCES = \
 	getenv.h \
 	string-utils.c \
 	string-utils.h \
+	event-notifier-notification.c \
 	ns.h \
-	creds.h
+	creds.h \
+	rculfhash.c \
+	rculfhash.h \
+	rculfhash-internal.h \
+	rculfhash-mm-chunk.c \
+	rculfhash-mm-mmap.c \
+	rculfhash-mm-order.c \
+	compat_futex.c \
+	futex.h
 
 if HAVE_PERF_EVENT
 liblttng_ust_runtime_la_SOURCES += \
@@ -99,6 +116,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,15 +125,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 = \
 	-lrt \
-	$(URCU_CDS_LIBS) \
+	liblttng-ust-common.la \
 	$(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)