X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2FMakefile.am;h=b101a81ea30c56a52adf9c35a2f8f203e30e8cd0;hb=f73bcf5eafdc10b2bbb32de0bcef709de0f8f5e5;hp=5fcfb5f54ffcf1a568e19049c4e2e7558ae84192;hpb=793dd3d99daee051358de2b751472dcd29c11a2f;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/Makefile.am b/src/lib/lttng-ust/Makefile.am
index 5fcfb5f5..b101a81e 100644
--- a/src/lib/lttng-ust/Makefile.am
+++ b/src/lib/lttng-ust/Makefile.am
@@ -1,24 +1,12 @@
 # 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-tracepoint.la liblttng-ust.la
-
-liblttng_ust_tracepoint_la_SOURCES = \
-	tracepoint.c \
-	tracepoint-weak-test.c \
-	tracepoint-internal.h \
-	lttng-tracer-core.h
-
-liblttng_ust_tracepoint_la_LIBADD = \
-	$(top_builddir)/src/lib/lttng-ust-common/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)
+noinst_LTLIBRARIES = \
+	liblttng-ust-runtime.la \
+	liblttng-ust-support.la
 
 liblttng_ust_runtime_la_SOURCES = \
 	bytecode.h \
@@ -53,19 +41,16 @@ liblttng_ust_runtime_la_SOURCES = \
 	lttng-context-vsgid.c \
 	lttng-context.c \
 	lttng-events.c \
-	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 \
 	tracef.c \
 	lttng-ust-tracef-provider.h \
 	tracelog.c \
@@ -76,7 +61,8 @@ liblttng_ust_runtime_la_SOURCES = \
 	rculfhash-internal.h \
 	rculfhash-mm-chunk.c \
 	rculfhash-mm-mmap.c \
-	rculfhash-mm-order.c
+	rculfhash-mm-order.c \
+	strerror.c
 
 if HAVE_PERF_EVENT
 liblttng_ust_runtime_la_SOURCES += \
@@ -88,7 +74,6 @@ 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 \
@@ -99,9 +84,7 @@ liblttng_ust_support_la_SOURCES = \
 	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
+	lttng-counter-client-percpu-64-modular.c
 
 liblttng_ust_la_SOURCES =
 
@@ -116,7 +99,7 @@ liblttng_ust_la_LIBADD = \
 	$(top_builddir)/src/lib/lttng-ust-common/liblttng-ust-common.la \
 	$(top_builddir)/src/common/libustcomm.la \
 	$(top_builddir)/src/common/libcommon.la \
-	liblttng-ust-tracepoint.la \
+	$(top_builddir)/src/lib/lttng-ust-tracepoint/liblttng-ust-tracepoint.la \
 	liblttng-ust-runtime.la liblttng-ust-support.la \
 	$(DL_LIBS)