From 6339062a5bbe886493d0691d13e28e37a7206362 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 12 Apr 2021 15:19:23 -0400 Subject: [PATCH] Move liblttng-ust to 'src/lib/' This is part of an effort to standardize our autotools setup across projects to simplify maintenance. Change-Id: I5df7b12202e4ba06bfb9532e8098ac80bd2073a2 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .gitignore | 2 +- configure.ac | 2 +- doc/examples/Makefile.am | 4 ++-- src/Makefile.am | 1 - src/common/ustcomm.c | 2 +- src/lib/Makefile.am | 1 + src/lib/lttng-ust-ctl/Makefile.am | 4 ++-- src/lib/lttng-ust-ctl/ustctl.c | 14 +++++++------- src/lib/lttng-ust-cyg-profile/Makefile.am | 4 ++-- src/lib/lttng-ust-dl/Makefile.am | 2 +- src/lib/lttng-ust-dl/lttng-ust-dl.c | 2 +- src/lib/lttng-ust-fd/Makefile.am | 2 +- src/lib/lttng-ust-fork/Makefile.am | 2 +- .../lttng-ust-java-agent/jni/common/Makefile.am | 2 +- src/lib/lttng-ust-java-agent/jni/jul/Makefile.am | 2 +- src/lib/lttng-ust-java-agent/jni/log4j/Makefile.am | 2 +- src/lib/lttng-ust-java/Makefile.am | 2 +- src/lib/lttng-ust-libc-wrapper/Makefile.am | 4 ++-- src/lib/lttng-ust-python-agent/Makefile.am | 2 +- src/{liblttng-ust => lib/lttng-ust}/Makefile.am | 0 src/{liblttng-ust => lib/lttng-ust}/bytecode.h | 0 src/{liblttng-ust => lib/lttng-ust}/clock.h | 0 src/{liblttng-ust => lib/lttng-ust}/compat_futex.c | 0 .../lttng-ust}/context-internal.h | 0 .../lttng-ust}/context-provider-internal.h | 0 src/{liblttng-ust => lib/lttng-ust}/creds.h | 0 src/{liblttng-ust => lib/lttng-ust}/error.h | 0 .../lttng-ust}/event-notifier-notification.c | 0 src/{liblttng-ust => lib/lttng-ust}/fd-tracker.c | 0 src/{liblttng-ust => lib/lttng-ust}/futex.h | 0 src/{liblttng-ust => lib/lttng-ust}/getenv.c | 0 src/{liblttng-ust => lib/lttng-ust}/getenv.h | 0 src/{liblttng-ust => lib/lttng-ust}/jhash.h | 0 .../lttng-ust}/lttng-bytecode-interpreter.c | 0 .../lttng-ust}/lttng-bytecode-specialize.c | 0 .../lttng-ust}/lttng-bytecode-validator.c | 0 .../lttng-ust}/lttng-bytecode.c | 0 .../lttng-ust}/lttng-bytecode.h | 0 src/{liblttng-ust => lib/lttng-ust}/lttng-clock.c | 0 .../lttng-ust}/lttng-context-cgroup-ns.c | 0 .../lttng-ust}/lttng-context-cpu-id.c | 0 .../lttng-ust}/lttng-context-ip.c | 0 .../lttng-ust}/lttng-context-ipc-ns.c | 0 .../lttng-ust}/lttng-context-mnt-ns.c | 0 .../lttng-ust}/lttng-context-net-ns.c | 0 .../lttng-ust}/lttng-context-perf-counters.c | 0 .../lttng-ust}/lttng-context-pid-ns.c | 0 .../lttng-ust}/lttng-context-procname.c | 0 .../lttng-ust}/lttng-context-provider.c | 0 .../lttng-ust}/lttng-context-pthread-id.c | 0 .../lttng-ust}/lttng-context-time-ns.c | 0 .../lttng-ust}/lttng-context-user-ns.c | 0 .../lttng-ust}/lttng-context-uts-ns.c | 0 .../lttng-ust}/lttng-context-vegid.c | 0 .../lttng-ust}/lttng-context-veuid.c | 0 .../lttng-ust}/lttng-context-vgid.c | 0 .../lttng-ust}/lttng-context-vpid.c | 0 .../lttng-ust}/lttng-context-vsgid.c | 0 .../lttng-ust}/lttng-context-vsuid.c | 0 .../lttng-ust}/lttng-context-vtid.c | 0 .../lttng-ust}/lttng-context-vuid.c | 0 .../lttng-ust}/lttng-context.c | 0 .../lttng-counter-client-percpu-32-modular.c | 0 .../lttng-counter-client-percpu-64-modular.c | 0 .../lttng-ust}/lttng-counter-client.h | 0 src/{liblttng-ust => lib/lttng-ust}/lttng-events.c | 0 src/{liblttng-ust => lib/lttng-ust}/lttng-getcpu.c | 0 .../lttng-ust}/lttng-hash-helper.h | 0 src/{liblttng-ust => lib/lttng-ust}/lttng-probes.c | 0 .../lttng-ust}/lttng-rb-clients.h | 0 .../lttng-ring-buffer-client-discard-rt.c | 0 .../lttng-ust}/lttng-ring-buffer-client-discard.c | 0 .../lttng-ring-buffer-client-overwrite-rt.c | 0 .../lttng-ring-buffer-client-overwrite.c | 0 .../lttng-ust}/lttng-ring-buffer-client-template.h | 0 .../lttng-ring-buffer-metadata-client-template.h | 0 .../lttng-ust}/lttng-ring-buffer-metadata-client.c | 0 .../lttng-ust}/lttng-tracer-core.h | 0 src/{liblttng-ust => lib/lttng-ust}/lttng-tracer.h | 0 .../lttng-ust}/lttng-ust-abi.c | 0 .../lttng-ust}/lttng-ust-comm.c | 0 .../lttng-ust}/lttng-ust-dynamic-type.c | 0 .../lttng-ust}/lttng-ust-elf.c | 0 .../lttng-ust}/lttng-ust-elf.h | 0 .../lttng-ust}/lttng-ust-statedump-provider.h | 0 .../lttng-ust}/lttng-ust-statedump.c | 0 .../lttng-ust}/lttng-ust-statedump.h | 0 .../lttng-ust}/lttng-ust-tracef-provider.h | 0 .../lttng-ust}/lttng-ust-tracelog-provider.h | 0 .../lttng-ust}/lttng-ust-urcu-pointer.c | 0 .../lttng-ust}/lttng-ust-urcu.c | 0 .../lttng-ust}/lttng-ust-uuid.h | 0 src/{liblttng-ust => lib/lttng-ust}/ns.h | 0 src/{liblttng-ust => lib/lttng-ust}/perf_event.h | 0 .../lttng-ust}/rculfhash-internal.h | 0 .../lttng-ust}/rculfhash-mm-chunk.c | 0 .../lttng-ust}/rculfhash-mm-mmap.c | 0 .../lttng-ust}/rculfhash-mm-order.c | 0 src/{liblttng-ust => lib/lttng-ust}/rculfhash.c | 0 src/{liblttng-ust => lib/lttng-ust}/rculfhash.h | 0 src/{liblttng-ust => lib/lttng-ust}/string-utils.c | 0 src/{liblttng-ust => lib/lttng-ust}/string-utils.h | 0 src/{liblttng-ust => lib/lttng-ust}/tracef.c | 0 src/{liblttng-ust => lib/lttng-ust}/tracelog.c | 0 .../lttng-ust}/tracepoint-internal.h | 0 .../lttng-ust}/tracepoint-weak-test.c | 0 src/{liblttng-ust => lib/lttng-ust}/tracepoint.c | 0 src/{liblttng-ust => lib/lttng-ust}/ust-common.c | 0 src/{liblttng-ust => lib/lttng-ust}/ust-core.c | 0 .../lttng-ust}/ust-events-internal.h | 0 src/{liblttng-ust => lib/lttng-ust}/ust_lib.c | 0 src/{liblttng-ust => lib/lttng-ust}/ust_lib.h | 0 src/{liblttng-ust => lib/lttng-ust}/wait.h | 0 tests/benchmark/Makefile.am | 4 ++-- tests/compile/ctf-types/Makefile.am | 2 +- tests/compile/hello-many/Makefile.am | 2 +- tests/compile/hello.cxx/Makefile.am | 2 +- tests/compile/hello/Makefile.am | 2 +- tests/compile/same_line_tracepoint/Makefile.am | 2 +- tests/compile/test-app-ctx/Makefile.am | 2 +- tests/unit/libringbuffer/Makefile.am | 2 +- tests/unit/ust-elf/Makefile.am | 2 +- tests/unit/ust-error/Makefile.am | 2 +- tests/unit/ust-utils/Makefile.am | 4 ++-- 124 files changed, 41 insertions(+), 41 deletions(-) rename src/{liblttng-ust => lib/lttng-ust}/Makefile.am (100%) rename src/{liblttng-ust => lib/lttng-ust}/bytecode.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/clock.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/compat_futex.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/context-internal.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/context-provider-internal.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/creds.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/error.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/event-notifier-notification.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/fd-tracker.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/futex.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/getenv.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/getenv.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/jhash.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-bytecode-interpreter.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-bytecode-specialize.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-bytecode-validator.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-bytecode.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-bytecode.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-clock.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-cgroup-ns.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-cpu-id.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-ip.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-ipc-ns.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-mnt-ns.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-net-ns.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-perf-counters.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-pid-ns.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-procname.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-provider.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-pthread-id.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-time-ns.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-user-ns.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-uts-ns.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-vegid.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-veuid.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-vgid.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-vpid.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-vsgid.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-vsuid.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-vtid.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context-vuid.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-context.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-counter-client-percpu-32-modular.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-counter-client-percpu-64-modular.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-counter-client.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-events.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-getcpu.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-hash-helper.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-probes.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-rb-clients.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ring-buffer-client-discard-rt.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ring-buffer-client-discard.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ring-buffer-client-overwrite-rt.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ring-buffer-client-overwrite.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ring-buffer-client-template.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ring-buffer-metadata-client-template.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ring-buffer-metadata-client.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-tracer-core.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-tracer.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ust-abi.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ust-comm.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ust-dynamic-type.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ust-elf.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ust-elf.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ust-statedump-provider.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ust-statedump.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ust-statedump.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ust-tracef-provider.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ust-tracelog-provider.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ust-urcu-pointer.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ust-urcu.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/lttng-ust-uuid.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/ns.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/perf_event.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/rculfhash-internal.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/rculfhash-mm-chunk.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/rculfhash-mm-mmap.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/rculfhash-mm-order.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/rculfhash.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/rculfhash.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/string-utils.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/string-utils.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/tracef.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/tracelog.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/tracepoint-internal.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/tracepoint-weak-test.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/tracepoint.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/ust-common.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/ust-core.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/ust-events-internal.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/ust_lib.c (100%) rename src/{liblttng-ust => lib/lttng-ust}/ust_lib.h (100%) rename src/{liblttng-ust => lib/lttng-ust}/wait.h (100%) diff --git a/.gitignore b/.gitignore index 3475a8fc..d6ae329f 100644 --- a/.gitignore +++ b/.gitignore @@ -144,7 +144,7 @@ cscope.* /src/lib/lttng-ust-libc-wrapper/Makefile /src/lib/lttng-ust-python-agent/Makefile /src/lib/Makefile -/src/liblttng-ust/Makefile +/src/lib/lttng-ust/Makefile /src/python-lttngust/Makefile /src/Makefile /tests/Makefile diff --git a/configure.ac b/configure.ac index 561eb08c..968a70aa 100644 --- a/configure.ac +++ b/configure.ac @@ -536,7 +536,7 @@ AC_CONFIG_FILES([ src/lib/lttng-ust-java-agent/Makefile src/lib/lttng-ust-java/Makefile src/lib/lttng-ust-libc-wrapper/Makefile - src/liblttng-ust/Makefile + src/lib/lttng-ust/Makefile src/lib/lttng-ust-python-agent/Makefile src/lib/Makefile src/lttng-ust-ctl.pc diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index ce517922..8ee05646 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -142,7 +142,7 @@ all-local: CFLAGS='$(CFLAGS)' \ AM_CFLAGS='$(AM_CFLAGS)' \ LDFLAGS="$(LDFLAGS)" \ - AM_LDFLAGS='$(AM_LDFLAGS) -L../../../src/liblttng-ust/.libs -Wl,-rpath="$(PWD)/../../src/liblttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../src/liblttng-ust/.libs/"' \ + AM_LDFLAGS='$(AM_LDFLAGS) -L../../../src/lib/lttng-ust/.libs -Wl,-rpath="$(PWD)/../../src/lib/lttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../src/lib/lttng-ust/.libs/"' \ LTTNG_GEN_TP_PATH="$$rel_src_subdir$(top_srcdir)/tools/" \ AM_V_P="$(AM_V_P)" \ AM_V_at="$(AM_V_at)" \ @@ -184,7 +184,7 @@ all-local: CXX="$(CXX)" \ $(CMAKE) \ -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \ - -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/src/liblttng-ust/.libs" \ + -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/src/lib/lttng-ust/.libs" \ -DCMAKE_C_FLAGS="$(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS)" \ -DCMAKE_CXX_FLAGS="$(AM_CXXFLAGS) $(CXXFLAGS) $(CPPFLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$(AM_LDFLAGS) $(LDFLAGS)" \ diff --git a/src/Makefile.am b/src/Makefile.am index 80fc8c3f..b59b1f5f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,6 @@ SUBDIRS = \ common \ - liblttng-ust \ lib if ENABLE_PYTHON_AGENT diff --git a/src/common/ustcomm.c b/src/common/ustcomm.c index ddd23ba8..d6588992 100644 --- a/src/common/ustcomm.c +++ b/src/common/ustcomm.c @@ -27,7 +27,7 @@ #include "common/dynamic-type.h" #include "common/logging.h" -#include "../liblttng-ust/ust-events-internal.h" +#include "lib/lttng-ust/ust-events-internal.h" #include "common/compat/pthread.h" #define USTCOMM_CODE_OFFSET(code) \ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 646638fa..6bb3ece9 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 \ lttng-ust-ctl \ lttng-ust-fd \ lttng-ust-fork \ diff --git a/src/lib/lttng-ust-ctl/Makefile.am b/src/lib/lttng-ust-ctl/Makefile.am index 1d4eef33..b85be9f6 100644 --- a/src/lib/lttng-ust-ctl/Makefile.am +++ b/src/lib/lttng-ust-ctl/Makefile.am @@ -10,8 +10,8 @@ liblttng_ust_ctl_la_LDFLAGS = \ -version-info $(LTTNG_UST_CTL_LIBRARY_VERSION) liblttng_ust_ctl_la_LIBADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust-common.la \ - $(top_builddir)/src/liblttng-ust/liblttng-ust-support.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust-common.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust-support.la \ $(top_builddir)/src/common/libustcomm.la \ $(top_builddir)/src/common/libcommon.la \ $(DL_LIBS) diff --git a/src/lib/lttng-ust-ctl/ustctl.c b/src/lib/lttng-ust-ctl/ustctl.c index 488148bf..72550653 100644 --- a/src/lib/lttng-ust-ctl/ustctl.c +++ b/src/lib/lttng-ust-ctl/ustctl.c @@ -24,13 +24,13 @@ #include "common/ringbuffer/backend.h" #include "common/ringbuffer/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 "lib/lttng-ust/ust-events-internal.h" +#include "lib/lttng-ust/wait.h" +#include "lib/lttng-ust/lttng-rb-clients.h" +#include "lib/lttng-ust/clock.h" +#include "lib/lttng-ust/getenv.h" +#include "lib/lttng-ust/lttng-tracer-core.h" +#include "lib/lttng-ust/lttng-counter-client.h" #include "common/counter/smp.h" #include "common/counter/counter.h" diff --git a/src/lib/lttng-ust-cyg-profile/Makefile.am b/src/lib/lttng-ust-cyg-profile/Makefile.am index 7e8b226f..26b50156 100644 --- a/src/lib/lttng-ust-cyg-profile/Makefile.am +++ b/src/lib/lttng-ust-cyg-profile/Makefile.am @@ -10,7 +10,7 @@ liblttng_ust_cyg_profile_la_SOURCES = \ lttng-ust-cyg-profile.h liblttng_ust_cyg_profile_la_LIBADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(DL_LIBS) liblttng_ust_cyg_profile_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) @@ -20,7 +20,7 @@ liblttng_ust_cyg_profile_fast_la_SOURCES = \ lttng-ust-cyg-profile-fast.h liblttng_ust_cyg_profile_fast_la_LIBADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(DL_LIBS) liblttng_ust_cyg_profile_fast_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) diff --git a/src/lib/lttng-ust-dl/Makefile.am b/src/lib/lttng-ust-dl/Makefile.am index 75149ea4..f1b87ea8 100644 --- a/src/lib/lttng-ust-dl/Makefile.am +++ b/src/lib/lttng-ust-dl/Makefile.am @@ -9,7 +9,7 @@ liblttng_ust_dl_la_SOURCES = \ ust_dl.h liblttng_ust_dl_la_LIBADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(top_builddir)/src/common/libcommon.la \ $(DL_LIBS) diff --git a/src/lib/lttng-ust-dl/lttng-ust-dl.c b/src/lib/lttng-ust-dl/lttng-ust-dl.c index 62bda028..82cb07f0 100644 --- a/src/lib/lttng-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 "lib/lttng-ust/ust-events-internal.h" /* Include link.h last else it conflicts with ust-dlfcn. */ #include diff --git a/src/lib/lttng-ust-fd/Makefile.am b/src/lib/lttng-ust-fd/Makefile.am index 6571b112..145240d6 100644 --- a/src/lib/lttng-ust-fd/Makefile.am +++ b/src/lib/lttng-ust-fd/Makefile.am @@ -7,7 +7,7 @@ liblttng_ust_fd_la_SOURCES = \ lttng-ust-fd.c liblttng_ust_fd_la_LIBADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(DL_LIBS) liblttng_ust_fd_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) diff --git a/src/lib/lttng-ust-fork/Makefile.am b/src/lib/lttng-ust-fork/Makefile.am index b5feca4b..de3d2d60 100644 --- a/src/lib/lttng-ust-fork/Makefile.am +++ b/src/lib/lttng-ust-fork/Makefile.am @@ -5,7 +5,7 @@ AM_CFLAGS += -fno-strict-aliasing lib_LTLIBRARIES = liblttng-ust-fork.la liblttng_ust_fork_la_SOURCES = ustfork.c liblttng_ust_fork_la_LIBADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(DL_LIBS) liblttng_ust_fork_la_CFLAGS = -DUST_COMPONENT=liblttng-ust-fork $(AM_CFLAGS) diff --git a/src/lib/lttng-ust-java-agent/jni/common/Makefile.am b/src/lib/lttng-ust-java-agent/jni/common/Makefile.am index c066157b..42f84e8c 100644 --- a/src/lib/lttng-ust-java-agent/jni/common/Makefile.am +++ b/src/lib/lttng-ust-java-agent/jni/common/Makefile.am @@ -8,4 +8,4 @@ liblttng_ust_context_jni_la_SOURCES = lttng_ust_context.c lttng_ust_context.h nodist_liblttng_ust_context_jni_la_SOURCES = org_lttng_ust_agent_context_LttngContextApi.h liblttng_ust_context_jni_la_LIBADD = -lc \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la diff --git a/src/lib/lttng-ust-java-agent/jni/jul/Makefile.am b/src/lib/lttng-ust-java-agent/jni/jul/Makefile.am index 295b033d..df389e5c 100644 --- a/src/lib/lttng-ust-java-agent/jni/jul/Makefile.am +++ b/src/lib/lttng-ust-java-agent/jni/jul/Makefile.am @@ -9,5 +9,5 @@ liblttng_ust_jul_jni_la_SOURCES = lttng_ust_jul.c \ nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_agent_jul_LttngJulApi.h liblttng_ust_jul_jni_la_LIBADD = -lc \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(top_builddir)/src/lib/lttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la diff --git a/src/lib/lttng-ust-java-agent/jni/log4j/Makefile.am b/src/lib/lttng-ust-java-agent/jni/log4j/Makefile.am index 029462e9..8d952574 100644 --- a/src/lib/lttng-ust-java-agent/jni/log4j/Makefile.am +++ b/src/lib/lttng-ust-java-agent/jni/log4j/Makefile.am @@ -9,5 +9,5 @@ liblttng_ust_log4j_jni_la_SOURCES = lttng_ust_log4j.c \ nodist_liblttng_ust_log4j_jni_la_SOURCES = org_lttng_ust_agent_log4j_LttngLog4jApi.h liblttng_ust_log4j_jni_la_LIBADD = -lc \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(top_builddir)/src/lib/lttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la diff --git a/src/lib/lttng-ust-java/Makefile.am b/src/lib/lttng-ust-java/Makefile.am index 55252fbb..f5120691 100644 --- a/src/lib/lttng-ust-java/Makefile.am +++ b/src/lib/lttng-ust-java/Makefile.am @@ -15,7 +15,7 @@ liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h liblttng_ust_java_la_LIBADD = -lc \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la $(jarfile): classnoinst.stamp $(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class diff --git a/src/lib/lttng-ust-libc-wrapper/Makefile.am b/src/lib/lttng-ust-libc-wrapper/Makefile.am index 6b02142d..f3fcee69 100644 --- a/src/lib/lttng-ust-libc-wrapper/Makefile.am +++ b/src/lib/lttng-ust-libc-wrapper/Makefile.am @@ -10,7 +10,7 @@ liblttng_ust_libc_wrapper_la_SOURCES = \ ust_libc.h liblttng_ust_libc_wrapper_la_LIBADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(DL_LIBS) liblttng_ust_libc_wrapper_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) @@ -20,7 +20,7 @@ liblttng_ust_pthread_wrapper_la_SOURCES = \ ust_pthread.h liblttng_ust_pthread_wrapper_la_LIBADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(DL_LIBS) liblttng_ust_pthread_wrapper_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) diff --git a/src/lib/lttng-ust-python-agent/Makefile.am b/src/lib/lttng-ust-python-agent/Makefile.am index f0ce5890..619a268f 100644 --- a/src/lib/lttng-ust-python-agent/Makefile.am +++ b/src/lib/lttng-ust-python-agent/Makefile.am @@ -8,7 +8,7 @@ lib_LTLIBRARIES = liblttng-ust-python-agent.la liblttng_ust_python_agent_la_SOURCES = lttng_ust_python.c lttng_ust_python.h liblttng_ust_python_agent_la_LIBADD = \ -lc \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la # Follow the main library soname for co-installability liblttng_ust_python_agent_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) diff --git a/src/liblttng-ust/Makefile.am b/src/lib/lttng-ust/Makefile.am similarity index 100% rename from src/liblttng-ust/Makefile.am rename to src/lib/lttng-ust/Makefile.am diff --git a/src/liblttng-ust/bytecode.h b/src/lib/lttng-ust/bytecode.h similarity index 100% rename from src/liblttng-ust/bytecode.h rename to src/lib/lttng-ust/bytecode.h diff --git a/src/liblttng-ust/clock.h b/src/lib/lttng-ust/clock.h similarity index 100% rename from src/liblttng-ust/clock.h rename to src/lib/lttng-ust/clock.h diff --git a/src/liblttng-ust/compat_futex.c b/src/lib/lttng-ust/compat_futex.c similarity index 100% rename from src/liblttng-ust/compat_futex.c rename to src/lib/lttng-ust/compat_futex.c diff --git a/src/liblttng-ust/context-internal.h b/src/lib/lttng-ust/context-internal.h similarity index 100% rename from src/liblttng-ust/context-internal.h rename to src/lib/lttng-ust/context-internal.h diff --git a/src/liblttng-ust/context-provider-internal.h b/src/lib/lttng-ust/context-provider-internal.h similarity index 100% rename from src/liblttng-ust/context-provider-internal.h rename to src/lib/lttng-ust/context-provider-internal.h diff --git a/src/liblttng-ust/creds.h b/src/lib/lttng-ust/creds.h similarity index 100% rename from src/liblttng-ust/creds.h rename to src/lib/lttng-ust/creds.h diff --git a/src/liblttng-ust/error.h b/src/lib/lttng-ust/error.h similarity index 100% rename from src/liblttng-ust/error.h rename to src/lib/lttng-ust/error.h diff --git a/src/liblttng-ust/event-notifier-notification.c b/src/lib/lttng-ust/event-notifier-notification.c similarity index 100% rename from src/liblttng-ust/event-notifier-notification.c rename to src/lib/lttng-ust/event-notifier-notification.c diff --git a/src/liblttng-ust/fd-tracker.c b/src/lib/lttng-ust/fd-tracker.c similarity index 100% rename from src/liblttng-ust/fd-tracker.c rename to src/lib/lttng-ust/fd-tracker.c diff --git a/src/liblttng-ust/futex.h b/src/lib/lttng-ust/futex.h similarity index 100% rename from src/liblttng-ust/futex.h rename to src/lib/lttng-ust/futex.h diff --git a/src/liblttng-ust/getenv.c b/src/lib/lttng-ust/getenv.c similarity index 100% rename from src/liblttng-ust/getenv.c rename to src/lib/lttng-ust/getenv.c diff --git a/src/liblttng-ust/getenv.h b/src/lib/lttng-ust/getenv.h similarity index 100% rename from src/liblttng-ust/getenv.h rename to src/lib/lttng-ust/getenv.h diff --git a/src/liblttng-ust/jhash.h b/src/lib/lttng-ust/jhash.h similarity index 100% rename from src/liblttng-ust/jhash.h rename to src/lib/lttng-ust/jhash.h diff --git a/src/liblttng-ust/lttng-bytecode-interpreter.c b/src/lib/lttng-ust/lttng-bytecode-interpreter.c similarity index 100% rename from src/liblttng-ust/lttng-bytecode-interpreter.c rename to src/lib/lttng-ust/lttng-bytecode-interpreter.c diff --git a/src/liblttng-ust/lttng-bytecode-specialize.c b/src/lib/lttng-ust/lttng-bytecode-specialize.c similarity index 100% rename from src/liblttng-ust/lttng-bytecode-specialize.c rename to src/lib/lttng-ust/lttng-bytecode-specialize.c diff --git a/src/liblttng-ust/lttng-bytecode-validator.c b/src/lib/lttng-ust/lttng-bytecode-validator.c similarity index 100% rename from src/liblttng-ust/lttng-bytecode-validator.c rename to src/lib/lttng-ust/lttng-bytecode-validator.c diff --git a/src/liblttng-ust/lttng-bytecode.c b/src/lib/lttng-ust/lttng-bytecode.c similarity index 100% rename from src/liblttng-ust/lttng-bytecode.c rename to src/lib/lttng-ust/lttng-bytecode.c diff --git a/src/liblttng-ust/lttng-bytecode.h b/src/lib/lttng-ust/lttng-bytecode.h similarity index 100% rename from src/liblttng-ust/lttng-bytecode.h rename to src/lib/lttng-ust/lttng-bytecode.h diff --git a/src/liblttng-ust/lttng-clock.c b/src/lib/lttng-ust/lttng-clock.c similarity index 100% rename from src/liblttng-ust/lttng-clock.c rename to src/lib/lttng-ust/lttng-clock.c diff --git a/src/liblttng-ust/lttng-context-cgroup-ns.c b/src/lib/lttng-ust/lttng-context-cgroup-ns.c similarity index 100% rename from src/liblttng-ust/lttng-context-cgroup-ns.c rename to src/lib/lttng-ust/lttng-context-cgroup-ns.c diff --git a/src/liblttng-ust/lttng-context-cpu-id.c b/src/lib/lttng-ust/lttng-context-cpu-id.c similarity index 100% rename from src/liblttng-ust/lttng-context-cpu-id.c rename to src/lib/lttng-ust/lttng-context-cpu-id.c diff --git a/src/liblttng-ust/lttng-context-ip.c b/src/lib/lttng-ust/lttng-context-ip.c similarity index 100% rename from src/liblttng-ust/lttng-context-ip.c rename to src/lib/lttng-ust/lttng-context-ip.c diff --git a/src/liblttng-ust/lttng-context-ipc-ns.c b/src/lib/lttng-ust/lttng-context-ipc-ns.c similarity index 100% rename from src/liblttng-ust/lttng-context-ipc-ns.c rename to src/lib/lttng-ust/lttng-context-ipc-ns.c diff --git a/src/liblttng-ust/lttng-context-mnt-ns.c b/src/lib/lttng-ust/lttng-context-mnt-ns.c similarity index 100% rename from src/liblttng-ust/lttng-context-mnt-ns.c rename to src/lib/lttng-ust/lttng-context-mnt-ns.c diff --git a/src/liblttng-ust/lttng-context-net-ns.c b/src/lib/lttng-ust/lttng-context-net-ns.c similarity index 100% rename from src/liblttng-ust/lttng-context-net-ns.c rename to src/lib/lttng-ust/lttng-context-net-ns.c diff --git a/src/liblttng-ust/lttng-context-perf-counters.c b/src/lib/lttng-ust/lttng-context-perf-counters.c similarity index 100% rename from src/liblttng-ust/lttng-context-perf-counters.c rename to src/lib/lttng-ust/lttng-context-perf-counters.c diff --git a/src/liblttng-ust/lttng-context-pid-ns.c b/src/lib/lttng-ust/lttng-context-pid-ns.c similarity index 100% rename from src/liblttng-ust/lttng-context-pid-ns.c rename to src/lib/lttng-ust/lttng-context-pid-ns.c diff --git a/src/liblttng-ust/lttng-context-procname.c b/src/lib/lttng-ust/lttng-context-procname.c similarity index 100% rename from src/liblttng-ust/lttng-context-procname.c rename to src/lib/lttng-ust/lttng-context-procname.c diff --git a/src/liblttng-ust/lttng-context-provider.c b/src/lib/lttng-ust/lttng-context-provider.c similarity index 100% rename from src/liblttng-ust/lttng-context-provider.c rename to src/lib/lttng-ust/lttng-context-provider.c diff --git a/src/liblttng-ust/lttng-context-pthread-id.c b/src/lib/lttng-ust/lttng-context-pthread-id.c similarity index 100% rename from src/liblttng-ust/lttng-context-pthread-id.c rename to src/lib/lttng-ust/lttng-context-pthread-id.c diff --git a/src/liblttng-ust/lttng-context-time-ns.c b/src/lib/lttng-ust/lttng-context-time-ns.c similarity index 100% rename from src/liblttng-ust/lttng-context-time-ns.c rename to src/lib/lttng-ust/lttng-context-time-ns.c diff --git a/src/liblttng-ust/lttng-context-user-ns.c b/src/lib/lttng-ust/lttng-context-user-ns.c similarity index 100% rename from src/liblttng-ust/lttng-context-user-ns.c rename to src/lib/lttng-ust/lttng-context-user-ns.c diff --git a/src/liblttng-ust/lttng-context-uts-ns.c b/src/lib/lttng-ust/lttng-context-uts-ns.c similarity index 100% rename from src/liblttng-ust/lttng-context-uts-ns.c rename to src/lib/lttng-ust/lttng-context-uts-ns.c diff --git a/src/liblttng-ust/lttng-context-vegid.c b/src/lib/lttng-ust/lttng-context-vegid.c similarity index 100% rename from src/liblttng-ust/lttng-context-vegid.c rename to src/lib/lttng-ust/lttng-context-vegid.c diff --git a/src/liblttng-ust/lttng-context-veuid.c b/src/lib/lttng-ust/lttng-context-veuid.c similarity index 100% rename from src/liblttng-ust/lttng-context-veuid.c rename to src/lib/lttng-ust/lttng-context-veuid.c diff --git a/src/liblttng-ust/lttng-context-vgid.c b/src/lib/lttng-ust/lttng-context-vgid.c similarity index 100% rename from src/liblttng-ust/lttng-context-vgid.c rename to src/lib/lttng-ust/lttng-context-vgid.c diff --git a/src/liblttng-ust/lttng-context-vpid.c b/src/lib/lttng-ust/lttng-context-vpid.c similarity index 100% rename from src/liblttng-ust/lttng-context-vpid.c rename to src/lib/lttng-ust/lttng-context-vpid.c diff --git a/src/liblttng-ust/lttng-context-vsgid.c b/src/lib/lttng-ust/lttng-context-vsgid.c similarity index 100% rename from src/liblttng-ust/lttng-context-vsgid.c rename to src/lib/lttng-ust/lttng-context-vsgid.c diff --git a/src/liblttng-ust/lttng-context-vsuid.c b/src/lib/lttng-ust/lttng-context-vsuid.c similarity index 100% rename from src/liblttng-ust/lttng-context-vsuid.c rename to src/lib/lttng-ust/lttng-context-vsuid.c diff --git a/src/liblttng-ust/lttng-context-vtid.c b/src/lib/lttng-ust/lttng-context-vtid.c similarity index 100% rename from src/liblttng-ust/lttng-context-vtid.c rename to src/lib/lttng-ust/lttng-context-vtid.c diff --git a/src/liblttng-ust/lttng-context-vuid.c b/src/lib/lttng-ust/lttng-context-vuid.c similarity index 100% rename from src/liblttng-ust/lttng-context-vuid.c rename to src/lib/lttng-ust/lttng-context-vuid.c diff --git a/src/liblttng-ust/lttng-context.c b/src/lib/lttng-ust/lttng-context.c similarity index 100% rename from src/liblttng-ust/lttng-context.c rename to src/lib/lttng-ust/lttng-context.c diff --git a/src/liblttng-ust/lttng-counter-client-percpu-32-modular.c b/src/lib/lttng-ust/lttng-counter-client-percpu-32-modular.c similarity index 100% rename from src/liblttng-ust/lttng-counter-client-percpu-32-modular.c rename to src/lib/lttng-ust/lttng-counter-client-percpu-32-modular.c diff --git a/src/liblttng-ust/lttng-counter-client-percpu-64-modular.c b/src/lib/lttng-ust/lttng-counter-client-percpu-64-modular.c similarity index 100% rename from src/liblttng-ust/lttng-counter-client-percpu-64-modular.c rename to src/lib/lttng-ust/lttng-counter-client-percpu-64-modular.c diff --git a/src/liblttng-ust/lttng-counter-client.h b/src/lib/lttng-ust/lttng-counter-client.h similarity index 100% rename from src/liblttng-ust/lttng-counter-client.h rename to src/lib/lttng-ust/lttng-counter-client.h diff --git a/src/liblttng-ust/lttng-events.c b/src/lib/lttng-ust/lttng-events.c similarity index 100% rename from src/liblttng-ust/lttng-events.c rename to src/lib/lttng-ust/lttng-events.c diff --git a/src/liblttng-ust/lttng-getcpu.c b/src/lib/lttng-ust/lttng-getcpu.c similarity index 100% rename from src/liblttng-ust/lttng-getcpu.c rename to src/lib/lttng-ust/lttng-getcpu.c diff --git a/src/liblttng-ust/lttng-hash-helper.h b/src/lib/lttng-ust/lttng-hash-helper.h similarity index 100% rename from src/liblttng-ust/lttng-hash-helper.h rename to src/lib/lttng-ust/lttng-hash-helper.h diff --git a/src/liblttng-ust/lttng-probes.c b/src/lib/lttng-ust/lttng-probes.c similarity index 100% rename from src/liblttng-ust/lttng-probes.c rename to src/lib/lttng-ust/lttng-probes.c diff --git a/src/liblttng-ust/lttng-rb-clients.h b/src/lib/lttng-ust/lttng-rb-clients.h similarity index 100% rename from src/liblttng-ust/lttng-rb-clients.h rename to src/lib/lttng-ust/lttng-rb-clients.h diff --git a/src/liblttng-ust/lttng-ring-buffer-client-discard-rt.c b/src/lib/lttng-ust/lttng-ring-buffer-client-discard-rt.c similarity index 100% rename from src/liblttng-ust/lttng-ring-buffer-client-discard-rt.c rename to src/lib/lttng-ust/lttng-ring-buffer-client-discard-rt.c diff --git a/src/liblttng-ust/lttng-ring-buffer-client-discard.c b/src/lib/lttng-ust/lttng-ring-buffer-client-discard.c similarity index 100% rename from src/liblttng-ust/lttng-ring-buffer-client-discard.c rename to src/lib/lttng-ust/lttng-ring-buffer-client-discard.c diff --git a/src/liblttng-ust/lttng-ring-buffer-client-overwrite-rt.c b/src/lib/lttng-ust/lttng-ring-buffer-client-overwrite-rt.c similarity index 100% rename from src/liblttng-ust/lttng-ring-buffer-client-overwrite-rt.c rename to src/lib/lttng-ust/lttng-ring-buffer-client-overwrite-rt.c diff --git a/src/liblttng-ust/lttng-ring-buffer-client-overwrite.c b/src/lib/lttng-ust/lttng-ring-buffer-client-overwrite.c similarity index 100% rename from src/liblttng-ust/lttng-ring-buffer-client-overwrite.c rename to src/lib/lttng-ust/lttng-ring-buffer-client-overwrite.c diff --git a/src/liblttng-ust/lttng-ring-buffer-client-template.h b/src/lib/lttng-ust/lttng-ring-buffer-client-template.h similarity index 100% rename from src/liblttng-ust/lttng-ring-buffer-client-template.h rename to src/lib/lttng-ust/lttng-ring-buffer-client-template.h diff --git a/src/liblttng-ust/lttng-ring-buffer-metadata-client-template.h b/src/lib/lttng-ust/lttng-ring-buffer-metadata-client-template.h similarity index 100% rename from src/liblttng-ust/lttng-ring-buffer-metadata-client-template.h rename to src/lib/lttng-ust/lttng-ring-buffer-metadata-client-template.h diff --git a/src/liblttng-ust/lttng-ring-buffer-metadata-client.c b/src/lib/lttng-ust/lttng-ring-buffer-metadata-client.c similarity index 100% rename from src/liblttng-ust/lttng-ring-buffer-metadata-client.c rename to src/lib/lttng-ust/lttng-ring-buffer-metadata-client.c diff --git a/src/liblttng-ust/lttng-tracer-core.h b/src/lib/lttng-ust/lttng-tracer-core.h similarity index 100% rename from src/liblttng-ust/lttng-tracer-core.h rename to src/lib/lttng-ust/lttng-tracer-core.h diff --git a/src/liblttng-ust/lttng-tracer.h b/src/lib/lttng-ust/lttng-tracer.h similarity index 100% rename from src/liblttng-ust/lttng-tracer.h rename to src/lib/lttng-ust/lttng-tracer.h diff --git a/src/liblttng-ust/lttng-ust-abi.c b/src/lib/lttng-ust/lttng-ust-abi.c similarity index 100% rename from src/liblttng-ust/lttng-ust-abi.c rename to src/lib/lttng-ust/lttng-ust-abi.c diff --git a/src/liblttng-ust/lttng-ust-comm.c b/src/lib/lttng-ust/lttng-ust-comm.c similarity index 100% rename from src/liblttng-ust/lttng-ust-comm.c rename to src/lib/lttng-ust/lttng-ust-comm.c diff --git a/src/liblttng-ust/lttng-ust-dynamic-type.c b/src/lib/lttng-ust/lttng-ust-dynamic-type.c similarity index 100% rename from src/liblttng-ust/lttng-ust-dynamic-type.c rename to src/lib/lttng-ust/lttng-ust-dynamic-type.c diff --git a/src/liblttng-ust/lttng-ust-elf.c b/src/lib/lttng-ust/lttng-ust-elf.c similarity index 100% rename from src/liblttng-ust/lttng-ust-elf.c rename to src/lib/lttng-ust/lttng-ust-elf.c diff --git a/src/liblttng-ust/lttng-ust-elf.h b/src/lib/lttng-ust/lttng-ust-elf.h similarity index 100% rename from src/liblttng-ust/lttng-ust-elf.h rename to src/lib/lttng-ust/lttng-ust-elf.h diff --git a/src/liblttng-ust/lttng-ust-statedump-provider.h b/src/lib/lttng-ust/lttng-ust-statedump-provider.h similarity index 100% rename from src/liblttng-ust/lttng-ust-statedump-provider.h rename to src/lib/lttng-ust/lttng-ust-statedump-provider.h diff --git a/src/liblttng-ust/lttng-ust-statedump.c b/src/lib/lttng-ust/lttng-ust-statedump.c similarity index 100% rename from src/liblttng-ust/lttng-ust-statedump.c rename to src/lib/lttng-ust/lttng-ust-statedump.c diff --git a/src/liblttng-ust/lttng-ust-statedump.h b/src/lib/lttng-ust/lttng-ust-statedump.h similarity index 100% rename from src/liblttng-ust/lttng-ust-statedump.h rename to src/lib/lttng-ust/lttng-ust-statedump.h diff --git a/src/liblttng-ust/lttng-ust-tracef-provider.h b/src/lib/lttng-ust/lttng-ust-tracef-provider.h similarity index 100% rename from src/liblttng-ust/lttng-ust-tracef-provider.h rename to src/lib/lttng-ust/lttng-ust-tracef-provider.h diff --git a/src/liblttng-ust/lttng-ust-tracelog-provider.h b/src/lib/lttng-ust/lttng-ust-tracelog-provider.h similarity index 100% rename from src/liblttng-ust/lttng-ust-tracelog-provider.h rename to src/lib/lttng-ust/lttng-ust-tracelog-provider.h diff --git a/src/liblttng-ust/lttng-ust-urcu-pointer.c b/src/lib/lttng-ust/lttng-ust-urcu-pointer.c similarity index 100% rename from src/liblttng-ust/lttng-ust-urcu-pointer.c rename to src/lib/lttng-ust/lttng-ust-urcu-pointer.c diff --git a/src/liblttng-ust/lttng-ust-urcu.c b/src/lib/lttng-ust/lttng-ust-urcu.c similarity index 100% rename from src/liblttng-ust/lttng-ust-urcu.c rename to src/lib/lttng-ust/lttng-ust-urcu.c diff --git a/src/liblttng-ust/lttng-ust-uuid.h b/src/lib/lttng-ust/lttng-ust-uuid.h similarity index 100% rename from src/liblttng-ust/lttng-ust-uuid.h rename to src/lib/lttng-ust/lttng-ust-uuid.h diff --git a/src/liblttng-ust/ns.h b/src/lib/lttng-ust/ns.h similarity index 100% rename from src/liblttng-ust/ns.h rename to src/lib/lttng-ust/ns.h diff --git a/src/liblttng-ust/perf_event.h b/src/lib/lttng-ust/perf_event.h similarity index 100% rename from src/liblttng-ust/perf_event.h rename to src/lib/lttng-ust/perf_event.h diff --git a/src/liblttng-ust/rculfhash-internal.h b/src/lib/lttng-ust/rculfhash-internal.h similarity index 100% rename from src/liblttng-ust/rculfhash-internal.h rename to src/lib/lttng-ust/rculfhash-internal.h diff --git a/src/liblttng-ust/rculfhash-mm-chunk.c b/src/lib/lttng-ust/rculfhash-mm-chunk.c similarity index 100% rename from src/liblttng-ust/rculfhash-mm-chunk.c rename to src/lib/lttng-ust/rculfhash-mm-chunk.c diff --git a/src/liblttng-ust/rculfhash-mm-mmap.c b/src/lib/lttng-ust/rculfhash-mm-mmap.c similarity index 100% rename from src/liblttng-ust/rculfhash-mm-mmap.c rename to src/lib/lttng-ust/rculfhash-mm-mmap.c diff --git a/src/liblttng-ust/rculfhash-mm-order.c b/src/lib/lttng-ust/rculfhash-mm-order.c similarity index 100% rename from src/liblttng-ust/rculfhash-mm-order.c rename to src/lib/lttng-ust/rculfhash-mm-order.c diff --git a/src/liblttng-ust/rculfhash.c b/src/lib/lttng-ust/rculfhash.c similarity index 100% rename from src/liblttng-ust/rculfhash.c rename to src/lib/lttng-ust/rculfhash.c diff --git a/src/liblttng-ust/rculfhash.h b/src/lib/lttng-ust/rculfhash.h similarity index 100% rename from src/liblttng-ust/rculfhash.h rename to src/lib/lttng-ust/rculfhash.h diff --git a/src/liblttng-ust/string-utils.c b/src/lib/lttng-ust/string-utils.c similarity index 100% rename from src/liblttng-ust/string-utils.c rename to src/lib/lttng-ust/string-utils.c diff --git a/src/liblttng-ust/string-utils.h b/src/lib/lttng-ust/string-utils.h similarity index 100% rename from src/liblttng-ust/string-utils.h rename to src/lib/lttng-ust/string-utils.h diff --git a/src/liblttng-ust/tracef.c b/src/lib/lttng-ust/tracef.c similarity index 100% rename from src/liblttng-ust/tracef.c rename to src/lib/lttng-ust/tracef.c diff --git a/src/liblttng-ust/tracelog.c b/src/lib/lttng-ust/tracelog.c similarity index 100% rename from src/liblttng-ust/tracelog.c rename to src/lib/lttng-ust/tracelog.c diff --git a/src/liblttng-ust/tracepoint-internal.h b/src/lib/lttng-ust/tracepoint-internal.h similarity index 100% rename from src/liblttng-ust/tracepoint-internal.h rename to src/lib/lttng-ust/tracepoint-internal.h diff --git a/src/liblttng-ust/tracepoint-weak-test.c b/src/lib/lttng-ust/tracepoint-weak-test.c similarity index 100% rename from src/liblttng-ust/tracepoint-weak-test.c rename to src/lib/lttng-ust/tracepoint-weak-test.c diff --git a/src/liblttng-ust/tracepoint.c b/src/lib/lttng-ust/tracepoint.c similarity index 100% rename from src/liblttng-ust/tracepoint.c rename to src/lib/lttng-ust/tracepoint.c diff --git a/src/liblttng-ust/ust-common.c b/src/lib/lttng-ust/ust-common.c similarity index 100% rename from src/liblttng-ust/ust-common.c rename to src/lib/lttng-ust/ust-common.c diff --git a/src/liblttng-ust/ust-core.c b/src/lib/lttng-ust/ust-core.c similarity index 100% rename from src/liblttng-ust/ust-core.c rename to src/lib/lttng-ust/ust-core.c diff --git a/src/liblttng-ust/ust-events-internal.h b/src/lib/lttng-ust/ust-events-internal.h similarity index 100% rename from src/liblttng-ust/ust-events-internal.h rename to src/lib/lttng-ust/ust-events-internal.h diff --git a/src/liblttng-ust/ust_lib.c b/src/lib/lttng-ust/ust_lib.c similarity index 100% rename from src/liblttng-ust/ust_lib.c rename to src/lib/lttng-ust/ust_lib.c diff --git a/src/liblttng-ust/ust_lib.h b/src/lib/lttng-ust/ust_lib.h similarity index 100% rename from src/liblttng-ust/ust_lib.h rename to src/lib/lttng-ust/ust_lib.h diff --git a/src/liblttng-ust/wait.h b/src/lib/lttng-ust/wait.h similarity index 100% rename from src/liblttng-ust/wait.h rename to src/lib/lttng-ust/wait.h diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am index 9c31f0d1..efa09cef 100644 --- a/tests/benchmark/Makefile.am +++ b/tests/benchmark/Makefile.am @@ -5,13 +5,13 @@ AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers noinst_PROGRAMS = bench1 bench2 bench1_SOURCES = bench.c tp.c ust_tests_benchmark.h bench1_LDADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(DL_LIBS) bench2_SOURCES = bench.c tp.c ust_tests_benchmark.h bench2_CFLAGS = -DTRACING $(AM_CFLAGS) bench2_LDADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(DL_LIBS) dist_noinst_SCRIPTS = test_benchmark ptime diff --git a/tests/compile/ctf-types/Makefile.am b/tests/compile/ctf-types/Makefile.am index 6104d03f..eea45dea 100644 --- a/tests/compile/ctf-types/Makefile.am +++ b/tests/compile/ctf-types/Makefile.am @@ -6,7 +6,7 @@ noinst_PROGRAMS = ctf-types ctf_types_SOURCES = ctf-types.c tp.c ust_tests_ctf_types.h ctf_types_CFLAGS = -Werror=old-style-definition $(AM_CFLAGS) ctf_types_LDADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(DL_LIBS) EXTRA_DIST = README diff --git a/tests/compile/hello-many/Makefile.am b/tests/compile/hello-many/Makefile.am index bf650f67..a6fc3c3f 100644 --- a/tests/compile/hello-many/Makefile.am +++ b/tests/compile/hello-many/Makefile.am @@ -6,7 +6,7 @@ noinst_PROGRAMS = hello-many hello_many_SOURCES = hello-many.c tp.c ust_tests_hello_many.h hello_many_CFLAGS = -Werror=old-style-definition $(AM_CFLAGS) hello_many_LDADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(DL_LIBS) EXTRA_DIST = README diff --git a/tests/compile/hello.cxx/Makefile.am b/tests/compile/hello.cxx/Makefile.am index 1fc3fc94..153ca1e1 100644 --- a/tests/compile/hello.cxx/Makefile.am +++ b/tests/compile/hello.cxx/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers noinst_PROGRAMS = hello hello_SOURCES = hello.cpp tp-cpp.cpp ust_tests_hello.h hello_LDADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(DL_LIBS) EXTRA_DIST = README diff --git a/tests/compile/hello/Makefile.am b/tests/compile/hello/Makefile.am index a8a377a5..2ff99328 100644 --- a/tests/compile/hello/Makefile.am +++ b/tests/compile/hello/Makefile.am @@ -6,7 +6,7 @@ noinst_PROGRAMS = hello hello_SOURCES = hello.c tp.c ust_tests_hello.h hello_CFLAGS = -Werror=old-style-definition $(AM_CFLAGS) hello_LDADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(DL_LIBS) EXTRA_DIST = README diff --git a/tests/compile/same_line_tracepoint/Makefile.am b/tests/compile/same_line_tracepoint/Makefile.am index 8668d6f6..ef4d6dae 100644 --- a/tests/compile/same_line_tracepoint/Makefile.am +++ b/tests/compile/same_line_tracepoint/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers noinst_PROGRAMS = same_line_tracepoint same_line_tracepoint_SOURCES = same_line_tracepoint.c ust_tests_sameline.h same_line_tracepoint_LDADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(DL_LIBS) EXTRA_DIST = README diff --git a/tests/compile/test-app-ctx/Makefile.am b/tests/compile/test-app-ctx/Makefile.am index c913e412..c515859a 100644 --- a/tests/compile/test-app-ctx/Makefile.am +++ b/tests/compile/test-app-ctx/Makefile.am @@ -6,5 +6,5 @@ noinst_PROGRAMS = hello hello_SOURCES = hello.c tp.c ust_tests_hello.h hello_CFLAGS = -Werror=old-style-definition $(AM_CFLAGS) hello_LDADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(DL_LIBS) diff --git a/tests/unit/libringbuffer/Makefile.am b/tests/unit/libringbuffer/Makefile.am index 253e9dae..52b40123 100644 --- a/tests/unit/libringbuffer/Makefile.am +++ b/tests/unit/libringbuffer/Makefile.am @@ -6,6 +6,6 @@ noinst_PROGRAMS = test_shm test_shm_SOURCES = shm.c test_shm_LDADD = \ $(top_builddir)/src/common/libringbuffer.la \ - $(top_builddir)/src/liblttng-ust/liblttng-ust-common.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust-common.la \ $(top_builddir)/src/common/libcommon.la \ $(top_builddir)/tests/utils/libtap.a diff --git a/tests/unit/ust-elf/Makefile.am b/tests/unit/ust-elf/Makefile.am index 622d70b4..b7480556 100644 --- a/tests/unit/ust-elf/Makefile.am +++ b/tests/unit/ust-elf/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils noinst_PROGRAMS = ust-elf ust_elf_SOURCES = ust-elf.c ust_elf_LDADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(top_builddir)/tests/utils/libtap.a dist_check_SCRIPTS = test_ust_elf diff --git a/tests/unit/ust-error/Makefile.am b/tests/unit/ust-error/Makefile.am index 3e6ff34f..a472b150 100644 --- a/tests/unit/ust-error/Makefile.am +++ b/tests/unit/ust-error/Makefile.am @@ -5,5 +5,5 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils noinst_PROGRAMS = test_ust_error test_ust_error_SOURCES = ust-error.c test_ust_error_LDADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(top_builddir)/tests/utils/libtap.a diff --git a/tests/unit/ust-utils/Makefile.am b/tests/unit/ust-utils/Makefile.am index eb7c505e..f76d7bdf 100644 --- a/tests/unit/ust-utils/Makefile.am +++ b/tests/unit/ust-utils/Makefile.am @@ -5,13 +5,13 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils noinst_PROGRAMS = test_ust_utils test_ust_utils_SOURCES = ust-utils.c ust-utils-common.h test_ust_utils_LDADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(top_builddir)/tests/utils/libtap.a if HAVE_CXX noinst_PROGRAMS += test_ust_utils_cxx test_ust_utils_cxx_SOURCES = ust-utils-cxx.cpp ust-utils-common.h test_ust_utils_cxx_LDADD = \ - $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/lib/lttng-ust/liblttng-ust.la \ $(top_builddir)/tests/utils/libtap.a endif -- 2.34.1