From 4871194b8eadb66e3a9f00cee0372dd7573567ca Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 9 Apr 2021 14:25:52 -0400 Subject: [PATCH] Move liblttng-ust-dl 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: I1e6a0597ed9ea79f661393a48f149a982f360d1d Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .gitignore | 2 +- configure.ac | 2 +- src/Makefile.am | 4 ---- src/lib/Makefile.am | 4 ++++ src/{liblttng-ust-dl => lib/lttng-ust-dl}/Makefile.am | 0 src/{liblttng-ust-dl => lib/lttng-ust-dl}/lttng-ust-dl.c | 2 +- src/{liblttng-ust-dl => lib/lttng-ust-dl}/ust_dl.c | 0 src/{liblttng-ust-dl => lib/lttng-ust-dl}/ust_dl.h | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename src/{liblttng-ust-dl => lib/lttng-ust-dl}/Makefile.am (100%) rename src/{liblttng-ust-dl => lib/lttng-ust-dl}/lttng-ust-dl.c (99%) rename src/{liblttng-ust-dl => lib/lttng-ust-dl}/ust_dl.c (100%) rename src/{liblttng-ust-dl => lib/lttng-ust-dl}/ust_dl.h (100%) diff --git a/.gitignore b/.gitignore index 098b2277..88f36282 100644 --- a/.gitignore +++ b/.gitignore @@ -129,7 +129,7 @@ cscope.* /src/liblttng-ust-comm/Makefile /src/liblttng-ust-ctl/Makefile /src/lib/lttng-ust-cyg-profile/Makefile -/src/liblttng-ust-dl/Makefile +/src/lib/lttng-ust-dl/Makefile /src/lib/lttng-ust-fd/Makefile /src/lib/lttng-ust-fork/Makefile /src/liblttng-ust-java-agent/Makefile diff --git a/configure.ac b/configure.ac index a75b323e..8b6fb562 100644 --- a/configure.ac +++ b/configure.ac @@ -523,7 +523,7 @@ AC_CONFIG_FILES([ src/liblttng-ust-comm/Makefile src/liblttng-ust-ctl/Makefile src/lib/lttng-ust-cyg-profile/Makefile - src/liblttng-ust-dl/Makefile + src/lib/lttng-ust-dl/Makefile src/lib/lttng-ust-fd/Makefile src/lib/lttng-ust-fork/Makefile src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 86480840..f51694ec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,10 +9,6 @@ SUBDIRS = \ liblttng-ust-ctl \ lib -if ENABLE_UST_DL -SUBDIRS += liblttng-ust-dl -endif - if ENABLE_JNI_INTERFACE SUBDIRS += liblttng-ust-java endif diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 0803fc00..0b33906e 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -6,6 +6,10 @@ SUBDIRS = \ lttng-ust-cyg-profile \ lttng-ust-libc-wrapper +if ENABLE_UST_DL +SUBDIRS += lttng-ust-dl +endif + if ENABLE_PYTHON_AGENT SUBDIRS += lttng-ust-python-agent endif diff --git a/src/liblttng-ust-dl/Makefile.am b/src/lib/lttng-ust-dl/Makefile.am similarity index 100% rename from src/liblttng-ust-dl/Makefile.am rename to src/lib/lttng-ust-dl/Makefile.am diff --git a/src/liblttng-ust-dl/lttng-ust-dl.c b/src/lib/lttng-ust-dl/lttng-ust-dl.c similarity index 99% rename from src/liblttng-ust-dl/lttng-ust-dl.c rename to src/lib/lttng-ust-dl/lttng-ust-dl.c index 6444e3fb..62bda028 100644 --- a/src/liblttng-ust-dl/lttng-ust-dl.c +++ b/src/lib/lttng-ust-dl/lttng-ust-dl.c @@ -22,7 +22,7 @@ #include "common/macros.h" #include "common/logging.h" -#include "../liblttng-ust/ust-events-internal.h" +#include "liblttng-ust/ust-events-internal.h" /* Include link.h last else it conflicts with ust-dlfcn. */ #include diff --git a/src/liblttng-ust-dl/ust_dl.c b/src/lib/lttng-ust-dl/ust_dl.c similarity index 100% rename from src/liblttng-ust-dl/ust_dl.c rename to src/lib/lttng-ust-dl/ust_dl.c diff --git a/src/liblttng-ust-dl/ust_dl.h b/src/lib/lttng-ust-dl/ust_dl.h similarity index 100% rename from src/liblttng-ust-dl/ust_dl.h rename to src/lib/lttng-ust-dl/ust_dl.h -- 2.34.1