X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2FMakefile.am;h=a3c6df331ba98459d97b4aa9fb7ea1156a60cf4d;hb=c53279a3e7796da67c5ad8d5e5657bf03def2dcb;hp=169db3298f4310aae4489b64674276b59139fc62;hpb=fb54defd7e47e106bdf3b7eb07d53f0aba0525ec;p=lttng-ust.git

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 169db329..a3c6df33 100644
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -1,8 +1,16 @@
+# SPDX-License-Identifier: LGPL-2.1-only
+
 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 +21,7 @@ liblttng_ust_tracepoint_la_SOURCES = \
 	error.h
 
 liblttng_ust_tracepoint_la_LIBADD = \
-	-lurcu-bp \
+	liblttng-ust-common.la \
 	$(top_builddir)/snprintf/libustsnprintf.la \
 	$(DL_LIBS)
 
@@ -21,9 +29,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,20 +61,18 @@ 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-elf.h \
 	lttng-ust-statedump.c \
 	lttng-ust-statedump.h \
 	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 \
@@ -74,8 +86,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 += \
@@ -91,13 +112,16 @@ liblttng_ust_support_la_SOURCES = \
 	getenv.c \
 	lttng-ust-dynamic-type.c \
 	lttng-rb-clients.h \
-	lttng-ring-buffer-client.h \
+	lttng-ring-buffer-client-template.h \
 	lttng-ring-buffer-client-discard.c \
 	lttng-ring-buffer-client-discard-rt.c \
 	lttng-ring-buffer-client-overwrite.c \
 	lttng-ring-buffer-client-overwrite-rt.c \
-	lttng-ring-buffer-metadata-client.h \
+	lttng-ring-buffer-metadata-client-template.h \
 	lttng-ring-buffer-metadata-client.c \
+	lttng-counter-client.h \
+	lttng-counter-client-percpu-32-modular.c \
+	lttng-counter-client-percpu-64-modular.c \
 	lttng-clock.c lttng-getcpu.c
 
 liblttng_ust_la_SOURCES =
@@ -105,15 +129,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 \
-	-lurcu-cds \
+	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)