X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2FMakefile.am;h=30233d6e13f71ad2b842c4f58c535641346103fa;hb=e03d7c66c57bf268b87296566a5160039f35ccfb;hp=1d0e85f153b16e8d35b0767f8ca116839b849b7c;hpb=e58e5ad5abb76f1d91d6b23ec77036ff1616f832;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/Makefile.am b/src/lib/lttng-ust/Makefile.am
index 1d0e85f1..30233d6e 100644
--- a/src/lib/lttng-ust/Makefile.am
+++ b/src/lib/lttng-ust/Makefile.am
@@ -1,39 +1,12 @@
+# SPDX-FileCopyrightText: 2023 EfficiOS, Inc
+#
 # SPDX-License-Identifier: LGPL-2.1-only
 
-AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing
+AM_CFLAGS += -I$(srcdir)
 
-noinst_LTLIBRARIES = liblttng-ust-runtime.la liblttng-ust-support.la
+lib_LTLIBRARIES = liblttng-ust.la
 
-lib_LTLIBRARIES = liblttng-ust-common.la liblttng-ust-tracepoint.la liblttng-ust.la
-
-# ust-common
-liblttng_ust_common_la_SOURCES = \
-	fd-tracker.c \
-	ust-common.c \
-	lttng-ust-urcu.c \
-	lttng-ust-urcu-pointer.c
-
-liblttng_ust_common_la_LIBADD = \
-	$(top_builddir)/src/common/libcommon.la
-
-liblttng_ust_common_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
-
-liblttng_ust_tracepoint_la_SOURCES = \
-	tracepoint.c \
-	tracepoint-weak-test.c \
-	tracepoint-internal.h \
-	lttng-tracer-core.h \
-	error.h
-
-liblttng_ust_tracepoint_la_LIBADD = \
-	liblttng-ust-common.la \
-	$(top_builddir)/src/common/libcommon.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" $(AM_CFLAGS)
-
-liblttng_ust_runtime_la_SOURCES = \
+liblttng_ust_la_SOURCES = \
 	bytecode.h \
 	lttng-ust-comm.c \
 	lttng-ust-abi.c \
@@ -66,76 +39,49 @@ liblttng_ust_runtime_la_SOURCES = \
 	lttng-context-vsgid.c \
 	lttng-context.c \
 	lttng-events.c \
-	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 \
+	futex.c \
+	futex.h \
 	ust_lib.c \
 	ust_lib.h \
 	context-internal.h \
 	context-provider-internal.h \
-	tracepoint-internal.h \
 	events.h \
-	clock.h \
-	lttng-ust-uuid.h \
-	error.h \
 	tracef.c \
 	lttng-ust-tracef-provider.h \
 	tracelog.c \
+	tracelog-internal.h \
 	lttng-ust-tracelog-provider.h \
-	string-utils.c \
-	string-utils.h \
 	event-notifier-notification.c \
-	ns.h \
 	rculfhash.c \
 	rculfhash.h \
 	rculfhash-internal.h \
 	rculfhash-mm-chunk.c \
 	rculfhash-mm-mmap.c \
-	rculfhash-mm-order.c
+	rculfhash-mm-order.c \
+	strerror.c \
+	lttng-tracer-core.h
 
 if HAVE_PERF_EVENT
-liblttng_ust_runtime_la_SOURCES += \
+liblttng_ust_la_SOURCES += \
 	lttng-context-perf-counters.c \
 	perf_event.h
 endif
 
-liblttng_ust_support_la_SOURCES = \
-	lttng-tracer.h \
-	lttng-tracer-core.h \
-	ust-core.c \
-	lttng-ust-dynamic-type.c \
-	lttng-rb-clients.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-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 \
-	getcpu.c getcpu.h
-
-liblttng_ust_la_SOURCES =
-
 liblttng_ust_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION)
 
-liblttng_ust_support_la_LIBADD = \
-	$(top_builddir)/src/common/libringbuffer.la \
-	$(top_builddir)/src/common/libcounter.la
-
 liblttng_ust_la_LIBADD = \
-	-lrt \
-	liblttng-ust-common.la \
+	$(top_builddir)/src/common/libringbuffer.la \
+	$(top_builddir)/src/common/libringbuffer-clients.la \
+	$(top_builddir)/src/common/libcounter.la \
+	$(top_builddir)/src/common/libcounter-clients.la \
 	$(top_builddir)/src/common/libustcomm.la \
 	$(top_builddir)/src/common/libcommon.la \
-	liblttng-ust-tracepoint.la \
-	liblttng-ust-runtime.la liblttng-ust-support.la \
+	$(top_builddir)/src/lib/lttng-ust-common/liblttng-ust-common.la \
+	$(top_builddir)/src/lib/lttng-ust-tracepoint/liblttng-ust-tracepoint.la \
+	-lrt \
 	$(DL_LIBS)
 
 liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" $(AM_CFLAGS)