X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2FMakefile.am;h=2b22471a0558ff6da2aa598a64ffaee7d3d74fa0;hb=bb863844b80f455f7c44279da57d966f7d42ab51;hp=7537bb7d7fa3f2188d34b5777ac18e2e0acb6bc2;hpb=cecabda899366e6d1e4add32316f8630ff583389;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/Makefile.am b/src/lib/lttng-ust/Makefile.am
index 7537bb7d..2b22471a 100644
--- a/src/lib/lttng-ust/Makefile.am
+++ b/src/lib/lttng-ust/Makefile.am
@@ -1,36 +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-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
-
-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)
+noinst_LTLIBRARIES = \
+	liblttng-ust-runtime.la \
+	liblttng-ust-support.la
 
 liblttng_ust_runtime_la_SOURCES = \
 	bytecode.h \
@@ -65,8 +41,6 @@ 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 \
@@ -74,7 +48,6 @@ liblttng_ust_runtime_la_SOURCES = \
 	ust_lib.h \
 	context-internal.h \
 	context-provider-internal.h \
-	tracepoint-internal.h \
 	events.h \
 	clock.h \
 	lttng-ust-uuid.h \
@@ -82,16 +55,14 @@ liblttng_ust_runtime_la_SOURCES = \
 	lttng-ust-tracef-provider.h \
 	tracelog.c \
 	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
 
 if HAVE_PERF_EVENT
 liblttng_ust_runtime_la_SOURCES += \
@@ -128,10 +99,10 @@ liblttng_ust_support_la_LIBADD = \
 
 liblttng_ust_la_LIBADD = \
 	-lrt \
-	liblttng-ust-common.la \
+	$(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)