From c80497fe9e16ce45bd058b05c7a65a48af8b85da Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 9 Apr 2021 15:02:15 -0400 Subject: [PATCH] Move liblttng-ust-ctl 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: I6a93f24016c38bf37e73d922a5a8a6ca2f4fa789 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .gitignore | 2 +- LICENSE | 4 +-- configure.ac | 2 +- src/Makefile.am | 1 - src/lib/Makefile.am | 1 + .../lttng-ust-ctl}/Makefile.am | 0 .../lttng-ust-ctl}/ustctl.c | 26 +++++++++---------- 7 files changed, 18 insertions(+), 18 deletions(-) rename src/{liblttng-ust-ctl => lib/lttng-ust-ctl}/Makefile.am (100%) rename src/{liblttng-ust-ctl => lib/lttng-ust-ctl}/ustctl.c (99%) diff --git a/.gitignore b/.gitignore index 0ad9442d..321714bb 100644 --- a/.gitignore +++ b/.gitignore @@ -127,7 +127,7 @@ cscope.* /src/common/Makefile /src/libcounter/Makefile /src/liblttng-ust-comm/Makefile -/src/liblttng-ust-ctl/Makefile +/src/lib/lttng-ust-ctl/Makefile /src/lib/lttng-ust-cyg-profile/Makefile /src/lib/lttng-ust-dl/Makefile /src/lib/lttng-ust-fd/Makefile diff --git a/LICENSE b/LICENSE index b817df40..3ae687b8 100644 --- a/LICENSE +++ b/LICENSE @@ -32,8 +32,8 @@ According with: This applies to: - liblttng-ust-ctl/ust-ctl-private.h - liblttng-ust-ctl/ustctl.c + src/lib/lttng-ust-ctl/ust-ctl-private.h + src/lib/lttng-ust-ctl/ustctl.c diff --git a/configure.ac b/configure.ac index d705ecb6..7ffc9cc2 100644 --- a/configure.ac +++ b/configure.ac @@ -521,7 +521,7 @@ AC_CONFIG_FILES([ src/common/Makefile src/libcounter/Makefile src/liblttng-ust-comm/Makefile - src/liblttng-ust-ctl/Makefile + src/lib/lttng-ust-ctl/Makefile src/lib/lttng-ust-cyg-profile/Makefile src/lib/lttng-ust-dl/Makefile src/lib/lttng-ust-fd/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 7facaf2b..1ed0c56f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,6 @@ SUBDIRS = \ liblttng-ust-comm \ libcounter \ liblttng-ust \ - liblttng-ust-ctl \ lib if ENABLE_PYTHON_AGENT diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index ec0b4538..646638fa 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-ctl \ lttng-ust-fd \ lttng-ust-fork \ lttng-ust-cyg-profile \ diff --git a/src/liblttng-ust-ctl/Makefile.am b/src/lib/lttng-ust-ctl/Makefile.am similarity index 100% rename from src/liblttng-ust-ctl/Makefile.am rename to src/lib/lttng-ust-ctl/Makefile.am diff --git a/src/liblttng-ust-ctl/ustctl.c b/src/lib/lttng-ust-ctl/ustctl.c similarity index 99% rename from src/liblttng-ust-ctl/ustctl.c rename to src/lib/lttng-ust-ctl/ustctl.c index a4e9d0e9..d585c71d 100644 --- a/src/liblttng-ust-ctl/ustctl.c +++ b/src/lib/lttng-ust-ctl/ustctl.c @@ -22,19 +22,19 @@ #include "common/macros.h" #include "common/align.h" -#include "../libringbuffer/backend.h" -#include "../libringbuffer/frontend.h" -#include "../liblttng-ust/ust-events-internal.h" -#include "../liblttng-ust/wait.h" -#include "../liblttng-ust/lttng-rb-clients.h" -#include "../liblttng-ust/clock.h" -#include "../liblttng-ust/getenv.h" -#include "../liblttng-ust/lttng-tracer-core.h" -#include "../liblttng-ust/lttng-counter-client.h" - -#include "../libcounter/shm.h" -#include "../libcounter/smp.h" -#include "../libcounter/counter.h" +#include "libringbuffer/backend.h" +#include "libringbuffer/frontend.h" +#include "liblttng-ust/ust-events-internal.h" +#include "liblttng-ust/wait.h" +#include "liblttng-ust/lttng-rb-clients.h" +#include "liblttng-ust/clock.h" +#include "liblttng-ust/getenv.h" +#include "liblttng-ust/lttng-tracer-core.h" +#include "liblttng-ust/lttng-counter-client.h" + +#include "libcounter/shm.h" +#include "libcounter/smp.h" +#include "libcounter/counter.h" /* * Number of milliseconds to retry before failing metadata writes on -- 2.34.1