From 4889a38dc8ef0267541a8f98e431bc9fd92eeb1f Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 9 Apr 2021 14:22:45 -0400 Subject: [PATCH] Move liblttng-ust-fd 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: I11fffd79c7f74ab602b115be94dfa28937e6ff2d Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .gitignore | 2 +- configure.ac | 2 +- src/Makefile.am | 3 +-- src/lib/Makefile.am | 1 + src/{liblttng-ust-fd => lib/lttng-ust-fd}/Makefile.am | 0 src/{liblttng-ust-fd => lib/lttng-ust-fd}/lttng-ust-fd.c | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename src/{liblttng-ust-fd => lib/lttng-ust-fd}/Makefile.am (100%) rename src/{liblttng-ust-fd => lib/lttng-ust-fd}/lttng-ust-fd.c (100%) diff --git a/.gitignore b/.gitignore index 714646dd..098b2277 100644 --- a/.gitignore +++ b/.gitignore @@ -130,7 +130,7 @@ cscope.* /src/liblttng-ust-ctl/Makefile /src/lib/lttng-ust-cyg-profile/Makefile /src/liblttng-ust-dl/Makefile -/src/liblttng-ust-fd/Makefile +/src/lib/lttng-ust-fd/Makefile /src/lib/lttng-ust-fork/Makefile /src/liblttng-ust-java-agent/Makefile /src/liblttng-ust-java-agent/java/Makefile diff --git a/configure.ac b/configure.ac index 7c2dd902..a75b323e 100644 --- a/configure.ac +++ b/configure.ac @@ -524,7 +524,7 @@ AC_CONFIG_FILES([ src/liblttng-ust-ctl/Makefile src/lib/lttng-ust-cyg-profile/Makefile src/liblttng-ust-dl/Makefile - src/liblttng-ust-fd/Makefile + src/lib/lttng-ust-fd/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 diff --git a/src/Makefile.am b/src/Makefile.am index 33f9ed14..86480840 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,8 +7,7 @@ SUBDIRS = \ libcounter \ liblttng-ust \ liblttng-ust-ctl \ - lib \ - liblttng-ust-fd + lib if ENABLE_UST_DL SUBDIRS += liblttng-ust-dl diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index bbaf9a01..0803fc00 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-fd \ lttng-ust-fork \ lttng-ust-cyg-profile \ lttng-ust-libc-wrapper diff --git a/src/liblttng-ust-fd/Makefile.am b/src/lib/lttng-ust-fd/Makefile.am similarity index 100% rename from src/liblttng-ust-fd/Makefile.am rename to src/lib/lttng-ust-fd/Makefile.am diff --git a/src/liblttng-ust-fd/lttng-ust-fd.c b/src/lib/lttng-ust-fd/lttng-ust-fd.c similarity index 100% rename from src/liblttng-ust-fd/lttng-ust-fd.c rename to src/lib/lttng-ust-fd/lttng-ust-fd.c -- 2.34.1