From 18a76df9471a85f29dcf1ed4dbce5e1db5e6e675 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 9 Apr 2021 14:17:48 -0400 Subject: [PATCH] Move liblttng-ust-cyg-profile 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: Ia06cfce8b57db814dc17ba01829e1498c4cb7aea Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .gitignore | 4 ++-- configure.ac | 4 ++-- src/Makefile.am | 4 +--- src/lib/Makefile.am | 2 ++ .../lttng-ust-cyg-profile}/Makefile.am | 0 .../lttng-ust-cyg-profile}/lttng-ust-cyg-profile-fast.c | 0 .../lttng-ust-cyg-profile}/lttng-ust-cyg-profile-fast.h | 0 .../lttng-ust-cyg-profile}/lttng-ust-cyg-profile.c | 0 .../lttng-ust-cyg-profile}/lttng-ust-cyg-profile.h | 0 .../lttng-ust-cyg-profile}/run | 0 .../lttng-ust-cyg-profile}/run-fast | 0 src/{liblttng-ust-fork => lib/lttng-ust-fork}/Makefile.am | 0 src/{liblttng-ust-fork => lib/lttng-ust-fork}/ustfork.c | 0 13 files changed, 7 insertions(+), 7 deletions(-) rename src/{liblttng-ust-cyg-profile => lib/lttng-ust-cyg-profile}/Makefile.am (100%) rename src/{liblttng-ust-cyg-profile => lib/lttng-ust-cyg-profile}/lttng-ust-cyg-profile-fast.c (100%) rename src/{liblttng-ust-cyg-profile => lib/lttng-ust-cyg-profile}/lttng-ust-cyg-profile-fast.h (100%) rename src/{liblttng-ust-cyg-profile => lib/lttng-ust-cyg-profile}/lttng-ust-cyg-profile.c (100%) rename src/{liblttng-ust-cyg-profile => lib/lttng-ust-cyg-profile}/lttng-ust-cyg-profile.h (100%) rename src/{liblttng-ust-cyg-profile => lib/lttng-ust-cyg-profile}/run (100%) rename src/{liblttng-ust-cyg-profile => lib/lttng-ust-cyg-profile}/run-fast (100%) rename src/{liblttng-ust-fork => lib/lttng-ust-fork}/Makefile.am (100%) rename src/{liblttng-ust-fork => lib/lttng-ust-fork}/ustfork.c (100%) diff --git a/.gitignore b/.gitignore index 92966cc8..714646dd 100644 --- a/.gitignore +++ b/.gitignore @@ -128,10 +128,10 @@ cscope.* /src/libcounter/Makefile /src/liblttng-ust-comm/Makefile /src/liblttng-ust-ctl/Makefile -/src/liblttng-ust-cyg-profile/Makefile +/src/lib/lttng-ust-cyg-profile/Makefile /src/liblttng-ust-dl/Makefile /src/liblttng-ust-fd/Makefile -/src/liblttng-ust-fork/Makefile +/src/lib/lttng-ust-fork/Makefile /src/liblttng-ust-java-agent/Makefile /src/liblttng-ust-java-agent/java/Makefile /src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile diff --git a/configure.ac b/configure.ac index c81e17e4..7c2dd902 100644 --- a/configure.ac +++ b/configure.ac @@ -522,10 +522,10 @@ AC_CONFIG_FILES([ src/libcounter/Makefile src/liblttng-ust-comm/Makefile src/liblttng-ust-ctl/Makefile - src/liblttng-ust-cyg-profile/Makefile + src/lib/lttng-ust-cyg-profile/Makefile src/liblttng-ust-dl/Makefile src/liblttng-ust-fd/Makefile - src/liblttng-ust-fork/Makefile + src/lib/lttng-ust-fork/Makefile src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile src/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 38c640bb..33f9ed14 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,9 +8,7 @@ SUBDIRS = \ liblttng-ust \ liblttng-ust-ctl \ lib \ - liblttng-ust-fd \ - liblttng-ust-fork \ - liblttng-ust-cyg-profile + liblttng-ust-fd if ENABLE_UST_DL SUBDIRS += liblttng-ust-dl diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 384b8481..bbaf9a01 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,6 +1,8 @@ # SPDX-License-Identifier: LGPL-2.1-only SUBDIRS = \ + lttng-ust-fork \ + lttng-ust-cyg-profile \ lttng-ust-libc-wrapper if ENABLE_PYTHON_AGENT diff --git a/src/liblttng-ust-cyg-profile/Makefile.am b/src/lib/lttng-ust-cyg-profile/Makefile.am similarity index 100% rename from src/liblttng-ust-cyg-profile/Makefile.am rename to src/lib/lttng-ust-cyg-profile/Makefile.am diff --git a/src/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.c b/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.c similarity index 100% rename from src/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.c rename to src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.c diff --git a/src/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h b/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h similarity index 100% rename from src/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h rename to src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h diff --git a/src/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c b/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile.c similarity index 100% rename from src/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c rename to src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile.c diff --git a/src/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.h b/src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile.h similarity index 100% rename from src/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.h rename to src/lib/lttng-ust-cyg-profile/lttng-ust-cyg-profile.h diff --git a/src/liblttng-ust-cyg-profile/run b/src/lib/lttng-ust-cyg-profile/run similarity index 100% rename from src/liblttng-ust-cyg-profile/run rename to src/lib/lttng-ust-cyg-profile/run diff --git a/src/liblttng-ust-cyg-profile/run-fast b/src/lib/lttng-ust-cyg-profile/run-fast similarity index 100% rename from src/liblttng-ust-cyg-profile/run-fast rename to src/lib/lttng-ust-cyg-profile/run-fast diff --git a/src/liblttng-ust-fork/Makefile.am b/src/lib/lttng-ust-fork/Makefile.am similarity index 100% rename from src/liblttng-ust-fork/Makefile.am rename to src/lib/lttng-ust-fork/Makefile.am diff --git a/src/liblttng-ust-fork/ustfork.c b/src/lib/lttng-ust-fork/ustfork.c similarity index 100% rename from src/liblttng-ust-fork/ustfork.c rename to src/lib/lttng-ust-fork/ustfork.c -- 2.34.1