X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2FMakefile.am;h=73ceb4383babee557ad6f85eab216c18f33012ee;hb=08ba2503b86d1506117c077c99eb1c38973a48f3;hp=51a18352d53e12700106df4ab3355ad73908f9ab;hpb=910dcd720731c190adbfb9bb50c67bb9c4235003;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/Makefile.am b/src/lib/lttng-ust/Makefile.am
index 51a18352..73ceb438 100644
--- a/src/lib/lttng-ust/Makefile.am
+++ b/src/lib/lttng-ust/Makefile.am
@@ -1,38 +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 \
-	jhash.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)
+noinst_LTLIBRARIES = \
+	liblttng-ust-runtime.la \
+	liblttng-ust-support.la
 
 liblttng_ust_runtime_la_SOURCES = \
 	bytecode.h \
@@ -67,39 +41,30 @@ 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 \
-	ust-events-internal.h \
+	events.h \
 	clock.h \
-	jhash.h \
 	lttng-ust-uuid.h \
-	error.h \
 	tracef.c \
 	lttng-ust-tracef-provider.h \
 	tracelog.c \
 	lttng-ust-tracelog-provider.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
+	strerror.c
 
 if HAVE_PERF_EVENT
 liblttng_ust_runtime_la_SOURCES += \
@@ -111,7 +76,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 \
@@ -136,10 +100,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)