From 3aa28d2301d8b9c1f7eef509e3de42bca2abbffe Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 14 Apr 2021 14:55:30 -0400 Subject: [PATCH] Move liblttng-ust-pthread-wrapper to 'src/lib/' Change-Id: Id38841b2338de290f7dc9ec68c10411031fc3d58 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .gitignore | 1 + configure.ac | 1 + src/lib/Makefile.am | 3 ++- src/lib/lttng-ust-libc-wrapper/Makefile.am | 13 +------------ src/lib/lttng-ust-pthread-wrapper/Makefile.am | 15 +++++++++++++++ .../lttng-ust-pthread.c | 0 .../ust_pthread.h | 0 7 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 src/lib/lttng-ust-pthread-wrapper/Makefile.am rename src/lib/{lttng-ust-libc-wrapper => lttng-ust-pthread-wrapper}/lttng-ust-pthread.c (100%) rename src/lib/{lttng-ust-libc-wrapper => lttng-ust-pthread-wrapper}/ust_pthread.h (100%) diff --git a/.gitignore b/.gitignore index f409ce70..326795a7 100644 --- a/.gitignore +++ b/.gitignore @@ -143,6 +143,7 @@ cscope.* /src/lib/lttng-ust-java-agent/jni/log4j/Makefile /src/lib/lttng-ust-java/Makefile /src/lib/lttng-ust-libc-wrapper/Makefile +/src/lib/lttng-ust-pthread-wrapper/Makefile /src/lib/lttng-ust-tracepoint/Makefile /src/lib/lttng-ust-python-agent/Makefile /src/lib/Makefile diff --git a/configure.ac b/configure.ac index be707b0f..54b00dcc 100644 --- a/configure.ac +++ b/configure.ac @@ -537,6 +537,7 @@ AC_CONFIG_FILES([ src/lib/lttng-ust-java-agent/Makefile src/lib/lttng-ust-java/Makefile src/lib/lttng-ust-libc-wrapper/Makefile + src/lib/lttng-ust-pthread-wrapper/Makefile src/lib/lttng-ust-tracepoint/Makefile src/lib/lttng-ust/Makefile src/lib/lttng-ust-python-agent/Makefile diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 49fbd75d..fbd12358 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -8,7 +8,8 @@ SUBDIRS = \ lttng-ust-fd \ lttng-ust-fork \ lttng-ust-cyg-profile \ - lttng-ust-libc-wrapper + lttng-ust-libc-wrapper \ + lttng-ust-pthread-wrapper if ENABLE_UST_DL SUBDIRS += lttng-ust-dl diff --git a/src/lib/lttng-ust-libc-wrapper/Makefile.am b/src/lib/lttng-ust-libc-wrapper/Makefile.am index f3fcee69..0507e4df 100644 --- a/src/lib/lttng-ust-libc-wrapper/Makefile.am +++ b/src/lib/lttng-ust-libc-wrapper/Makefile.am @@ -2,8 +2,7 @@ AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing -lib_LTLIBRARIES = liblttng-ust-libc-wrapper.la \ - liblttng-ust-pthread-wrapper.la +lib_LTLIBRARIES = liblttng-ust-libc-wrapper.la liblttng_ust_libc_wrapper_la_SOURCES = \ lttng-ust-malloc.c \ @@ -15,15 +14,5 @@ liblttng_ust_libc_wrapper_la_LIBADD = \ liblttng_ust_libc_wrapper_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) -liblttng_ust_pthread_wrapper_la_SOURCES = \ - lttng-ust-pthread.c \ - ust_pthread.h - -liblttng_ust_pthread_wrapper_la_LIBADD = \ - $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ - $(DL_LIBS) - -liblttng_ust_pthread_wrapper_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) - dist_noinst_SCRIPTS = run EXTRA_DIST = README diff --git a/src/lib/lttng-ust-pthread-wrapper/Makefile.am b/src/lib/lttng-ust-pthread-wrapper/Makefile.am new file mode 100644 index 00000000..3edb72a7 --- /dev/null +++ b/src/lib/lttng-ust-pthread-wrapper/Makefile.am @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: LGPL-2.1-only + +AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing + +lib_LTLIBRARIES = liblttng-ust-pthread-wrapper.la + +liblttng_ust_pthread_wrapper_la_SOURCES = \ + lttng-ust-pthread.c \ + ust_pthread.h + +liblttng_ust_pthread_wrapper_la_LIBADD = \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ + $(DL_LIBS) + +liblttng_ust_pthread_wrapper_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) diff --git a/src/lib/lttng-ust-libc-wrapper/lttng-ust-pthread.c b/src/lib/lttng-ust-pthread-wrapper/lttng-ust-pthread.c similarity index 100% rename from src/lib/lttng-ust-libc-wrapper/lttng-ust-pthread.c rename to src/lib/lttng-ust-pthread-wrapper/lttng-ust-pthread.c diff --git a/src/lib/lttng-ust-libc-wrapper/ust_pthread.h b/src/lib/lttng-ust-pthread-wrapper/ust_pthread.h similarity index 100% rename from src/lib/lttng-ust-libc-wrapper/ust_pthread.h rename to src/lib/lttng-ust-pthread-wrapper/ust_pthread.h -- 2.34.1