X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2FMakefile.am;h=bf06727d7784c234bd5f0951f4fbe39b141057fa;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=27acfec16471f4111e96f231ae78e66d1a4d511b;hpb=77d7fa989f79f3c2cb14d26576cbbb54b0637594;p=lttng-ust.git

diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am
index 27acfec1..bf06727d 100644
--- a/liblttng-ust/Makefile.am
+++ b/liblttng-ust/Makefile.am
@@ -1,9 +1,16 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
-AM_CFLAGS = -fno-strict-aliasing
+# 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 \
@@ -12,17 +19,25 @@ liblttng_ust_tracepoint_la_SOURCES = \
 	lttng-tracer-core.h \
 	jhash.h \
 	error.h
+
 liblttng_ust_tracepoint_la_LIBADD = \
-	-lurcu-bp \
-	-lpthread \
-	$(top_builddir)/snprintf/libustsnprintf.la
+	liblttng-ust-common.la \
+	$(top_builddir)/snprintf/libustsnprintf.la \
+	$(DL_LIBS)
+
 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 = \
+	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 \
@@ -30,14 +45,22 @@ liblttng_ust_runtime_la_SOURCES = \
 	lttng-context-procname.c \
 	lttng-context-ip.c \
 	lttng-context-cpu-id.c \
+	lttng-context-cgroup-ns.c \
+	lttng-context-ipc-ns.c \
+	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 \
+	lttng-context-veuid.c \
+	lttng-context-vsuid.c \
+	lttng-context-vgid.c \
+	lttng-context-vegid.c \
+	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 \
@@ -45,7 +68,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 \
@@ -56,7 +82,20 @@ 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 \
+	event-notifier-notification.c \
+	ns.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 += \
@@ -68,6 +107,8 @@ 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 \
@@ -77,6 +118,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 =
@@ -84,16 +127,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 \
-	-ldl \
+	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
+	liblttng-ust-runtime.la liblttng-ust-support.la \
+	$(top_builddir)/libmsgpack/libmsgpack.la \
+	$(DL_LIBS)
 
-liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" -fno-strict-aliasing
+liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" $(AM_CFLAGS)