From 7d03a1923ee8d9f96edd3b0d8771931e473c8e19 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 9 Apr 2021 14:13:14 -0400 Subject: [PATCH] Move liblttng-ust-libc-wrapper to 'src/lib/' Move all public libraries under 'src/lib/'. This is part of an effort to standardize our autotools setup across projects to simplify maintenance. Change-Id: I81b23df257bbfe3490f6ee7836b93732fcfb9fb2 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .gitignore | 2 +- configure.ac | 2 +- src/Makefile.am | 1 - src/lib/Makefile.am | 3 ++- .../lttng-ust-libc-wrapper}/Makefile.am | 0 .../lttng-ust-libc-wrapper}/README | 0 .../lttng-ust-libc-wrapper}/lttng-ust-malloc.c | 0 .../lttng-ust-libc-wrapper}/lttng-ust-pthread.c | 0 .../lttng-ust-libc-wrapper}/run | 0 .../lttng-ust-libc-wrapper}/ust_libc.h | 0 .../lttng-ust-libc-wrapper}/ust_pthread.h | 0 11 files changed, 4 insertions(+), 4 deletions(-) rename src/{liblttng-ust-libc-wrapper => lib/lttng-ust-libc-wrapper}/Makefile.am (100%) rename src/{liblttng-ust-libc-wrapper => lib/lttng-ust-libc-wrapper}/README (100%) rename src/{liblttng-ust-libc-wrapper => lib/lttng-ust-libc-wrapper}/lttng-ust-malloc.c (100%) rename src/{liblttng-ust-libc-wrapper => lib/lttng-ust-libc-wrapper}/lttng-ust-pthread.c (100%) rename src/{liblttng-ust-libc-wrapper => lib/lttng-ust-libc-wrapper}/run (100%) rename src/{liblttng-ust-libc-wrapper => lib/lttng-ust-libc-wrapper}/ust_libc.h (100%) rename src/{liblttng-ust-libc-wrapper => lib/lttng-ust-libc-wrapper}/ust_pthread.h (100%) diff --git a/.gitignore b/.gitignore index e0cbc8cb..92966cc8 100644 --- a/.gitignore +++ b/.gitignore @@ -143,7 +143,7 @@ cscope.* /src/liblttng-ust-java-agent/jni/jul/Makefile /src/liblttng-ust-java-agent/jni/log4j/Makefile /src/liblttng-ust-java/Makefile -/src/liblttng-ust-libc-wrapper/Makefile +/src/lib/lttng-ust-libc-wrapper/Makefile /src/lib/lttng-ust-python-agent/Makefile /src/lib/Makefile /src/liblttng-ust/Makefile diff --git a/configure.ac b/configure.ac index 2b03cee3..c81e17e4 100644 --- a/configure.ac +++ b/configure.ac @@ -537,7 +537,7 @@ AC_CONFIG_FILES([ src/liblttng-ust-java-agent/jni/Makefile src/liblttng-ust-java-agent/Makefile src/liblttng-ust-java/Makefile - src/liblttng-ust-libc-wrapper/Makefile + src/lib/lttng-ust-libc-wrapper/Makefile src/liblttng-ust/Makefile src/lib/lttng-ust-python-agent/Makefile src/lib/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 881eea26..38c640bb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,7 +10,6 @@ SUBDIRS = \ lib \ liblttng-ust-fd \ liblttng-ust-fork \ - liblttng-ust-libc-wrapper \ liblttng-ust-cyg-profile if ENABLE_UST_DL diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 1b70e530..384b8481 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,6 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-only -SUBDIRS = +SUBDIRS = \ + lttng-ust-libc-wrapper if ENABLE_PYTHON_AGENT SUBDIRS += lttng-ust-python-agent diff --git a/src/liblttng-ust-libc-wrapper/Makefile.am b/src/lib/lttng-ust-libc-wrapper/Makefile.am similarity index 100% rename from src/liblttng-ust-libc-wrapper/Makefile.am rename to src/lib/lttng-ust-libc-wrapper/Makefile.am diff --git a/src/liblttng-ust-libc-wrapper/README b/src/lib/lttng-ust-libc-wrapper/README similarity index 100% rename from src/liblttng-ust-libc-wrapper/README rename to src/lib/lttng-ust-libc-wrapper/README diff --git a/src/liblttng-ust-libc-wrapper/lttng-ust-malloc.c b/src/lib/lttng-ust-libc-wrapper/lttng-ust-malloc.c similarity index 100% rename from src/liblttng-ust-libc-wrapper/lttng-ust-malloc.c rename to src/lib/lttng-ust-libc-wrapper/lttng-ust-malloc.c diff --git a/src/liblttng-ust-libc-wrapper/lttng-ust-pthread.c b/src/lib/lttng-ust-libc-wrapper/lttng-ust-pthread.c similarity index 100% rename from src/liblttng-ust-libc-wrapper/lttng-ust-pthread.c rename to src/lib/lttng-ust-libc-wrapper/lttng-ust-pthread.c diff --git a/src/liblttng-ust-libc-wrapper/run b/src/lib/lttng-ust-libc-wrapper/run similarity index 100% rename from src/liblttng-ust-libc-wrapper/run rename to src/lib/lttng-ust-libc-wrapper/run diff --git a/src/liblttng-ust-libc-wrapper/ust_libc.h b/src/lib/lttng-ust-libc-wrapper/ust_libc.h similarity index 100% rename from src/liblttng-ust-libc-wrapper/ust_libc.h rename to src/lib/lttng-ust-libc-wrapper/ust_libc.h diff --git a/src/liblttng-ust-libc-wrapper/ust_pthread.h b/src/lib/lttng-ust-libc-wrapper/ust_pthread.h similarity index 100% rename from src/liblttng-ust-libc-wrapper/ust_pthread.h rename to src/lib/lttng-ust-libc-wrapper/ust_pthread.h -- 2.34.1