From 793dd3d99daee051358de2b751472dcd29c11a2f Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 8 Apr 2021 16:16:47 -0400 Subject: [PATCH] Move liblttng-ust-common to 'src/lib/' Change-Id: I263784a5dcc1a594eb9f51a40cadcbae1ae24860 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .gitignore | 1 + configure.ac | 1 + src/lib/Makefile.am | 1 + src/lib/lttng-ust-common/Makefile.am | 15 +++++++++++++++ .../fd-tracker.c | 0 .../lttng-ust-urcu-pointer.c | 0 .../lttng-ust-urcu.c | 0 .../ust-common.c | 0 src/lib/lttng-ust-ctl/Makefile.am | 2 +- src/lib/lttng-ust/Makefile.am | 18 +++--------------- tests/unit/libringbuffer/Makefile.am | 2 +- 11 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 src/lib/lttng-ust-common/Makefile.am rename src/lib/{lttng-ust => lttng-ust-common}/fd-tracker.c (100%) rename src/lib/{lttng-ust => lttng-ust-common}/lttng-ust-urcu-pointer.c (100%) rename src/lib/{lttng-ust => lttng-ust-common}/lttng-ust-urcu.c (100%) rename src/lib/{lttng-ust => lttng-ust-common}/ust-common.c (100%) diff --git a/.gitignore b/.gitignore index d6ae329f..b836c4c2 100644 --- a/.gitignore +++ b/.gitignore @@ -125,6 +125,7 @@ cscope.* /doc/man/Makefile /include/Makefile /src/common/Makefile +/src/lib/lttng-ust-common/Makefile /src/lib/lttng-ust-ctl/Makefile /src/lib/lttng-ust-cyg-profile/Makefile /src/lib/lttng-ust-dl/Makefile diff --git a/configure.ac b/configure.ac index 968a70aa..89b909af 100644 --- a/configure.ac +++ b/configure.ac @@ -519,6 +519,7 @@ AC_CONFIG_FILES([ doc/man/Makefile include/Makefile src/common/Makefile + src/lib/lttng-ust-common/Makefile src/lib/lttng-ust-ctl/Makefile src/lib/lttng-ust-cyg-profile/Makefile src/lib/lttng-ust-dl/Makefile diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 6bb3ece9..0a27437b 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,6 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-only SUBDIRS = \ + lttng-ust-common \ lttng-ust \ lttng-ust-ctl \ lttng-ust-fd \ diff --git a/src/lib/lttng-ust-common/Makefile.am b/src/lib/lttng-ust-common/Makefile.am new file mode 100644 index 00000000..bb32360f --- /dev/null +++ b/src/lib/lttng-ust-common/Makefile.am @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: LGPL-2.1-only + +lib_LTLIBRARIES = liblttng-ust-common.la + +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) + diff --git a/src/lib/lttng-ust/fd-tracker.c b/src/lib/lttng-ust-common/fd-tracker.c similarity index 100% rename from src/lib/lttng-ust/fd-tracker.c rename to src/lib/lttng-ust-common/fd-tracker.c diff --git a/src/lib/lttng-ust/lttng-ust-urcu-pointer.c b/src/lib/lttng-ust-common/lttng-ust-urcu-pointer.c similarity index 100% rename from src/lib/lttng-ust/lttng-ust-urcu-pointer.c rename to src/lib/lttng-ust-common/lttng-ust-urcu-pointer.c diff --git a/src/lib/lttng-ust/lttng-ust-urcu.c b/src/lib/lttng-ust-common/lttng-ust-urcu.c similarity index 100% rename from src/lib/lttng-ust/lttng-ust-urcu.c rename to src/lib/lttng-ust-common/lttng-ust-urcu.c diff --git a/src/lib/lttng-ust/ust-common.c b/src/lib/lttng-ust-common/ust-common.c similarity index 100% rename from src/lib/lttng-ust/ust-common.c rename to src/lib/lttng-ust-common/ust-common.c diff --git a/src/lib/lttng-ust-ctl/Makefile.am b/src/lib/lttng-ust-ctl/Makefile.am index b85be9f6..f8cc70cb 100644 --- a/src/lib/lttng-ust-ctl/Makefile.am +++ b/src/lib/lttng-ust-ctl/Makefile.am @@ -10,7 +10,7 @@ liblttng_ust_ctl_la_LDFLAGS = \ -version-info $(LTTNG_UST_CTL_LIBRARY_VERSION) liblttng_ust_ctl_la_LIBADD = \ - $(top_builddir)/src/lib/lttng-ust/liblttng-ust-common.la \ + $(top_builddir)/src/lib/lttng-ust-common/liblttng-ust-common.la \ $(top_builddir)/src/lib/lttng-ust/liblttng-ust-support.la \ $(top_builddir)/src/common/libustcomm.la \ $(top_builddir)/src/common/libcommon.la \ diff --git a/src/lib/lttng-ust/Makefile.am b/src/lib/lttng-ust/Makefile.am index 55be93f6..5fcfb5f5 100644 --- a/src/lib/lttng-ust/Makefile.am +++ b/src/lib/lttng-ust/Makefile.am @@ -4,19 +4,7 @@ AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing noinst_LTLIBRARIES = liblttng-ust-runtime.la liblttng-ust-support.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) +lib_LTLIBRARIES = liblttng-ust-tracepoint.la liblttng-ust.la liblttng_ust_tracepoint_la_SOURCES = \ tracepoint.c \ @@ -25,7 +13,7 @@ liblttng_ust_tracepoint_la_SOURCES = \ lttng-tracer-core.h liblttng_ust_tracepoint_la_LIBADD = \ - liblttng-ust-common.la \ + $(top_builddir)/src/lib/lttng-ust-common/liblttng-ust-common.la \ $(top_builddir)/src/common/libcommon.la \ $(DL_LIBS) @@ -125,7 +113,7 @@ 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 \ diff --git a/tests/unit/libringbuffer/Makefile.am b/tests/unit/libringbuffer/Makefile.am index 52b40123..c6f21f36 100644 --- a/tests/unit/libringbuffer/Makefile.am +++ b/tests/unit/libringbuffer/Makefile.am @@ -6,6 +6,6 @@ noinst_PROGRAMS = test_shm test_shm_SOURCES = shm.c test_shm_LDADD = \ $(top_builddir)/src/common/libringbuffer.la \ - $(top_builddir)/src/lib/lttng-ust/liblttng-ust-common.la \ + $(top_builddir)/src/lib/lttng-ust-common/liblttng-ust-common.la \ $(top_builddir)/src/common/libcommon.la \ $(top_builddir)/tests/utils/libtap.a -- 2.34.1