From f1b5fe11a15ca3bc3e45074673eeff5992d3daaf Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 9 Apr 2021 14:04:28 -0400 Subject: [PATCH] Move liblttng-ust-python-agent 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: If0eb731cc8f7faa860153f163b57f14292b7f522 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .gitignore | 3 ++- configure.ac | 3 ++- src/Makefile.am | 5 ++--- src/lib/Makefile.am | 7 +++++++ .../lttng-ust-python-agent}/Makefile.am | 0 .../lttng-ust-python-agent}/lttng_ust_python.c | 0 .../lttng-ust-python-agent}/lttng_ust_python.h | 0 7 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 src/lib/Makefile.am rename src/{liblttng-ust-python-agent => lib/lttng-ust-python-agent}/Makefile.am (100%) rename src/{liblttng-ust-python-agent => lib/lttng-ust-python-agent}/lttng_ust_python.c (100%) rename src/{liblttng-ust-python-agent => lib/lttng-ust-python-agent}/lttng_ust_python.h (100%) diff --git a/.gitignore b/.gitignore index bb9079bf..e0cbc8cb 100644 --- a/.gitignore +++ b/.gitignore @@ -144,7 +144,8 @@ cscope.* /src/liblttng-ust-java-agent/jni/log4j/Makefile /src/liblttng-ust-java/Makefile /src/liblttng-ust-libc-wrapper/Makefile -/src/liblttng-ust-python-agent/Makefile +/src/lib/lttng-ust-python-agent/Makefile +/src/lib/Makefile /src/liblttng-ust/Makefile /src/libringbuffer/Makefile /src/python-lttngust/Makefile diff --git a/configure.ac b/configure.ac index c9bf1e86..2b03cee3 100644 --- a/configure.ac +++ b/configure.ac @@ -539,7 +539,8 @@ AC_CONFIG_FILES([ src/liblttng-ust-java/Makefile src/liblttng-ust-libc-wrapper/Makefile src/liblttng-ust/Makefile - src/liblttng-ust-python-agent/Makefile + src/lib/lttng-ust-python-agent/Makefile + src/lib/Makefile src/libringbuffer/Makefile src/lttng-ust-ctl.pc src/lttng-ust.pc diff --git a/src/Makefile.am b/src/Makefile.am index a5e8ac94..881eea26 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,6 +7,7 @@ SUBDIRS = \ libcounter \ liblttng-ust \ liblttng-ust-ctl \ + lib \ liblttng-ust-fd \ liblttng-ust-fork \ liblttng-ust-libc-wrapper \ @@ -25,9 +26,7 @@ SUBDIRS += liblttng-ust-java-agent endif if ENABLE_PYTHON_AGENT -SUBDIRS += \ - python-lttngust \ - liblttng-ust-python-agent +SUBDIRS += python-lttngust endif pkgconfigdir = $(libdir)/pkgconfig diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am new file mode 100644 index 00000000..1b70e530 --- /dev/null +++ b/src/lib/Makefile.am @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-only + +SUBDIRS = + +if ENABLE_PYTHON_AGENT +SUBDIRS += lttng-ust-python-agent +endif diff --git a/src/liblttng-ust-python-agent/Makefile.am b/src/lib/lttng-ust-python-agent/Makefile.am similarity index 100% rename from src/liblttng-ust-python-agent/Makefile.am rename to src/lib/lttng-ust-python-agent/Makefile.am diff --git a/src/liblttng-ust-python-agent/lttng_ust_python.c b/src/lib/lttng-ust-python-agent/lttng_ust_python.c similarity index 100% rename from src/liblttng-ust-python-agent/lttng_ust_python.c rename to src/lib/lttng-ust-python-agent/lttng_ust_python.c diff --git a/src/liblttng-ust-python-agent/lttng_ust_python.h b/src/lib/lttng-ust-python-agent/lttng_ust_python.h similarity index 100% rename from src/liblttng-ust-python-agent/lttng_ust_python.h rename to src/lib/lttng-ust-python-agent/lttng_ust_python.h -- 2.34.1