From 9d4c8b2d907edb9ebc9bfde55602598e7ba0832e Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 2 Apr 2021 11:19:44 -0400 Subject: [PATCH] Move all sources to 'src/' This will align the source tree structure with our other projects and will make it easier to move the private headers currently located in the global 'include' directory. Change-Id: Ib016ec0c31de74990b1a8bb0792df2e7470bb994 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .gitignore | 184 ++++++++++++------ Makefile.am | 38 +--- configure.ac | 71 +++---- doc/examples/Makefile.am | 12 +- src/Makefile.am | 35 ++++ {libcounter => src/libcounter}/Makefile.am | 0 {libcounter => src/libcounter}/counter-api.h | 0 .../libcounter}/counter-config.h | 0 .../libcounter}/counter-internal.h | 0 .../libcounter}/counter-types.h | 0 {libcounter => src/libcounter}/counter.c | 0 {libcounter => src/libcounter}/counter.h | 0 {libcounter => src/libcounter}/shm.c | 0 {libcounter => src/libcounter}/shm.h | 0 {libcounter => src/libcounter}/shm_internal.h | 0 {libcounter => src/libcounter}/shm_types.h | 0 {libcounter => src/libcounter}/smp.c | 0 {libcounter => src/libcounter}/smp.h | 0 .../liblttng-ust-comm}/Makefile.am | 0 .../liblttng-ust-comm}/lttng-ust-comm.c | 0 .../liblttng-ust-comm}/lttng-ust-fd-tracker.c | 0 .../liblttng-ust-ctl}/Makefile.am | 8 +- .../liblttng-ust-ctl}/ustctl.c | 0 .../liblttng-ust-cyg-profile}/Makefile.am | 4 +- .../lttng-ust-cyg-profile-fast.c | 0 .../lttng-ust-cyg-profile-fast.h | 0 .../lttng-ust-cyg-profile.c | 0 .../lttng-ust-cyg-profile.h | 0 .../liblttng-ust-cyg-profile}/run | 0 .../liblttng-ust-cyg-profile}/run-fast | 0 .../liblttng-ust-dl}/Makefile.am | 4 +- .../liblttng-ust-dl}/lttng-ust-dl.c | 0 .../liblttng-ust-dl}/ust_dl.c | 0 .../liblttng-ust-dl}/ust_dl.h | 0 .../liblttng-ust-fd}/Makefile.am | 2 +- .../liblttng-ust-fd}/lttng-ust-fd.c | 0 .../liblttng-ust-fork}/Makefile.am | 2 +- .../liblttng-ust-fork}/ustfork.c | 0 .../liblttng-ust-java-agent}/Makefile.am | 0 .../liblttng-ust-java-agent}/java/Makefile.am | 0 .../java/lttng-ust-agent-all/Makefile.am | 0 .../java/lttng-ust-agent-all/Manifest.txt | 0 .../java/lttng-ust-agent-common/Makefile.am | 0 .../java/lttng-ust-agent-common/Manifest.txt | 0 .../lttng/ust/agent/AbstractLttngAgent.java | 0 .../org/lttng/ust/agent/EventNamePattern.java | 0 .../org/lttng/ust/agent/ILttngAgent.java | 0 .../org/lttng/ust/agent/ILttngHandler.java | 0 .../org/lttng/ust/agent/LTTngAgent.java | 0 .../agent/client/ILttngTcpClientListener.java | 0 .../ust/agent/client/LttngAgentResponse.java | 0 .../agent/client/LttngTcpSessiondClient.java | 0 .../ust/agent/client/SessiondCommand.java | 0 .../agent/client/SessiondCommandHeader.java | 0 .../SessiondDisableAppContextCommand.java | 0 .../client/SessiondDisableEventCommand.java | 0 .../SessiondEnableAppContextCommand.java | 0 .../client/SessiondEnableEventCommand.java | 0 .../client/SessiondListLoggersCommand.java | 0 .../ust/agent/context/ContextInfoManager.java | 0 .../agent/context/ContextInfoSerializer.java | 0 .../agent/context/IContextInfoRetriever.java | 0 .../ust/agent/context/LttngContextApi.java | 0 .../agent/filter/FilterChangeNotifier.java | 0 .../agent/filter/IFilterChangeListener.java | 0 .../lttng/ust/agent/session/EventRule.java | 0 .../ust/agent/session/LogLevelSelector.java | 0 .../ust/agent/utils/LttngUstAgentLogger.java | 0 .../java/lttng-ust-agent-jul/Makefile.am | 0 .../java/lttng-ust-agent-jul/Manifest.txt | 0 .../lttng/ust/agent/jul/LttngJulAgent.java | 0 .../org/lttng/ust/agent/jul/LttngJulApi.java | 0 .../lttng/ust/agent/jul/LttngLogHandler.java | 0 .../java/lttng-ust-agent-log4j/Makefile.am | 0 .../java/lttng-ust-agent-log4j/Manifest.txt | 0 .../ust/agent/log4j/LttngLog4jAgent.java | 0 .../lttng/ust/agent/log4j/LttngLog4jApi.java | 0 .../ust/agent/log4j/LttngLogAppender.java | 0 .../liblttng-ust-java-agent}/jni/Makefile.am | 0 .../jni/common/Makefile.am | 2 +- .../jni/common/lttng_ust_context.c | 0 .../jni/common/lttng_ust_context.h | 0 .../jni/jul/Makefile.am | 4 +- .../jni/jul/lttng_ust_jul.c | 0 .../jni/jul/lttng_ust_jul.h | 0 .../jni/log4j/Makefile.am | 4 +- .../jni/log4j/lttng_ust_log4j.c | 0 .../jni/log4j/lttng_ust_log4j.h | 0 .../liblttng-ust-java}/.gitignore | 0 .../liblttng-ust-java}/LTTngUst.c | 0 .../liblttng-ust-java}/Makefile.am | 2 +- .../liblttng-ust-java}/README | 0 .../liblttng-ust-java}/lttng_ust_java.h | 0 .../org/lttng/ust/LTTngUst.java | 0 .../liblttng-ust-libc-wrapper}/Makefile.am | 4 +- .../liblttng-ust-libc-wrapper}/README | 0 .../lttng-ust-malloc.c | 0 .../lttng-ust-pthread.c | 0 .../liblttng-ust-libc-wrapper}/run | 0 .../liblttng-ust-libc-wrapper}/ust_libc.h | 0 .../liblttng-ust-libc-wrapper}/ust_pthread.h | 0 .../liblttng-ust-python-agent}/Makefile.am | 5 +- .../lttng_ust_python.c | 0 .../lttng_ust_python.h | 0 .../liblttng-ust}/Makefile.am | 12 +- {liblttng-ust => src/liblttng-ust}/bytecode.h | 0 {liblttng-ust => src/liblttng-ust}/clock.h | 0 {liblttng-ust => src/liblttng-ust}/compat.h | 0 .../liblttng-ust}/compat_futex.c | 0 .../liblttng-ust}/context-internal.h | 0 .../liblttng-ust}/context-provider-internal.h | 0 {liblttng-ust => src/liblttng-ust}/creds.h | 0 {liblttng-ust => src/liblttng-ust}/error.h | 0 .../event-notifier-notification.c | 0 {liblttng-ust => src/liblttng-ust}/futex.h | 0 {liblttng-ust => src/liblttng-ust}/getenv.c | 0 {liblttng-ust => src/liblttng-ust}/getenv.h | 0 {liblttng-ust => src/liblttng-ust}/jhash.h | 0 .../lttng-bytecode-interpreter.c | 0 .../liblttng-ust}/lttng-bytecode-specialize.c | 0 .../liblttng-ust}/lttng-bytecode-validator.c | 0 .../liblttng-ust}/lttng-bytecode.c | 0 .../liblttng-ust}/lttng-bytecode.h | 0 .../liblttng-ust}/lttng-clock.c | 0 .../liblttng-ust}/lttng-context-cgroup-ns.c | 0 .../liblttng-ust}/lttng-context-cpu-id.c | 0 .../liblttng-ust}/lttng-context-ip.c | 0 .../liblttng-ust}/lttng-context-ipc-ns.c | 0 .../liblttng-ust}/lttng-context-mnt-ns.c | 0 .../liblttng-ust}/lttng-context-net-ns.c | 0 .../lttng-context-perf-counters.c | 0 .../liblttng-ust}/lttng-context-pid-ns.c | 0 .../liblttng-ust}/lttng-context-procname.c | 0 .../liblttng-ust}/lttng-context-provider.c | 0 .../liblttng-ust}/lttng-context-pthread-id.c | 0 .../liblttng-ust}/lttng-context-time-ns.c | 0 .../liblttng-ust}/lttng-context-user-ns.c | 0 .../liblttng-ust}/lttng-context-uts-ns.c | 0 .../liblttng-ust}/lttng-context-vegid.c | 0 .../liblttng-ust}/lttng-context-veuid.c | 0 .../liblttng-ust}/lttng-context-vgid.c | 0 .../liblttng-ust}/lttng-context-vpid.c | 0 .../liblttng-ust}/lttng-context-vsgid.c | 0 .../liblttng-ust}/lttng-context-vsuid.c | 0 .../liblttng-ust}/lttng-context-vtid.c | 0 .../liblttng-ust}/lttng-context-vuid.c | 0 .../liblttng-ust}/lttng-context.c | 0 .../lttng-counter-client-percpu-32-modular.c | 0 .../lttng-counter-client-percpu-64-modular.c | 0 .../liblttng-ust}/lttng-counter-client.h | 0 .../liblttng-ust}/lttng-events.c | 0 .../liblttng-ust}/lttng-getcpu.c | 0 .../liblttng-ust}/lttng-hash-helper.h | 0 .../liblttng-ust}/lttng-probes.c | 0 .../liblttng-ust}/lttng-rb-clients.h | 0 .../lttng-ring-buffer-client-discard-rt.c | 0 .../lttng-ring-buffer-client-discard.c | 0 .../lttng-ring-buffer-client-overwrite-rt.c | 0 .../lttng-ring-buffer-client-overwrite.c | 0 .../lttng-ring-buffer-client-template.h | 0 ...tng-ring-buffer-metadata-client-template.h | 0 .../lttng-ring-buffer-metadata-client.c | 0 .../liblttng-ust}/lttng-tracer-core.h | 0 .../liblttng-ust}/lttng-tracer.h | 0 .../liblttng-ust}/lttng-ust-abi.c | 0 .../liblttng-ust}/lttng-ust-comm.c | 0 .../liblttng-ust}/lttng-ust-dynamic-type.c | 0 .../liblttng-ust}/lttng-ust-elf.c | 0 .../liblttng-ust}/lttng-ust-elf.h | 0 .../lttng-ust-statedump-provider.h | 0 .../liblttng-ust}/lttng-ust-statedump.c | 0 .../liblttng-ust}/lttng-ust-statedump.h | 0 .../liblttng-ust}/lttng-ust-tracef-provider.h | 0 .../lttng-ust-tracelog-provider.h | 0 .../liblttng-ust}/lttng-ust-urcu-pointer.c | 0 .../liblttng-ust}/lttng-ust-urcu.c | 0 .../liblttng-ust}/lttng-ust-uuid.h | 0 {liblttng-ust => src/liblttng-ust}/ns.h | 0 .../liblttng-ust}/perf_event.h | 0 .../liblttng-ust}/rculfhash-internal.h | 0 .../liblttng-ust}/rculfhash-mm-chunk.c | 0 .../liblttng-ust}/rculfhash-mm-mmap.c | 0 .../liblttng-ust}/rculfhash-mm-order.c | 0 .../liblttng-ust}/rculfhash.c | 0 .../liblttng-ust}/rculfhash.h | 0 .../liblttng-ust}/string-utils.c | 0 .../liblttng-ust}/string-utils.h | 0 {liblttng-ust => src/liblttng-ust}/tracef.c | 0 {liblttng-ust => src/liblttng-ust}/tracelog.c | 0 .../liblttng-ust}/tracepoint-internal.h | 0 .../liblttng-ust}/tracepoint-weak-test.c | 0 .../liblttng-ust}/tracepoint.c | 0 {liblttng-ust => src/liblttng-ust}/ust-core.c | 0 .../liblttng-ust}/ust-events-internal.h | 0 {liblttng-ust => src/liblttng-ust}/ust_lib.c | 0 {liblttng-ust => src/liblttng-ust}/ust_lib.h | 0 {liblttng-ust => src/liblttng-ust}/wait.h | 0 {libmsgpack => src/libmsgpack}/Makefile.am | 0 {libmsgpack => src/libmsgpack}/msgpack.c | 0 {libmsgpack => src/libmsgpack}/msgpack.h | 0 .../libringbuffer}/Makefile.am | 0 {libringbuffer => src/libringbuffer}/api.h | 0 .../libringbuffer}/backend.h | 0 .../libringbuffer}/backend_internal.h | 0 .../libringbuffer}/backend_types.h | 0 .../libringbuffer}/frontend.h | 0 .../libringbuffer}/frontend_api.h | 0 .../libringbuffer}/frontend_internal.h | 0 .../libringbuffer}/frontend_types.h | 0 {libringbuffer => src/libringbuffer}/getcpu.h | 0 {libringbuffer => src/libringbuffer}/mmap.h | 0 {libringbuffer => src/libringbuffer}/nohz.h | 0 .../libringbuffer}/rb-init.h | 0 .../libringbuffer}/ring_buffer_backend.c | 0 .../libringbuffer}/ring_buffer_frontend.c | 0 .../libringbuffer}/ringbuffer-config.h | 0 {libringbuffer => src/libringbuffer}/shm.c | 0 {libringbuffer => src/libringbuffer}/shm.h | 0 .../libringbuffer}/shm_internal.h | 0 .../libringbuffer}/shm_types.h | 0 {libringbuffer => src/libringbuffer}/smp.c | 0 {libringbuffer => src/libringbuffer}/smp.h | 0 .../libringbuffer}/vatomic.h | 0 .../lttng-ust-ctl.pc.in | 0 lttng-ust.pc.in => src/lttng-ust.pc.in | 0 .../python-lttngust}/Makefile.am | 0 .../python-lttngust}/lttngust/__init__.py | 0 .../python-lttngust}/lttngust/agent.py | 0 .../python-lttngust}/lttngust/cmd.py | 0 .../python-lttngust}/lttngust/compat.py | 0 .../python-lttngust}/lttngust/debug.py | 0 .../python-lttngust}/lttngust/loghandler.py | 0 .../python-lttngust}/lttngust/version.py.in | 0 .../python-lttngust}/setup.py.in | 0 {snprintf => src/snprintf}/Makefile.am | 0 {snprintf => src/snprintf}/README | 0 {snprintf => src/snprintf}/core.c | 0 {snprintf => src/snprintf}/fflush.c | 0 {snprintf => src/snprintf}/fileext.h | 0 {snprintf => src/snprintf}/floatio.h | 0 {snprintf => src/snprintf}/fvwrite.c | 0 {snprintf => src/snprintf}/fvwrite.h | 0 {snprintf => src/snprintf}/local.h | 0 {snprintf => src/snprintf}/mbrtowc_sb.c | 0 {snprintf => src/snprintf}/patient_write.c | 0 {snprintf => src/snprintf}/snprintf.c | 0 {snprintf => src/snprintf}/various.h | 0 {snprintf => src/snprintf}/vfprintf.c | 0 {snprintf => src/snprintf}/wcio.h | 0 {snprintf => src/snprintf}/wsetup.c | 0 tests/benchmark/Makefile.am | 8 +- tests/compile/ctf-types/Makefile.am | 4 +- tests/compile/hello-many/Makefile.am | 4 +- tests/compile/hello.cxx/Makefile.am | 4 +- tests/compile/hello/Makefile.am | 4 +- .../compile/same_line_tracepoint/Makefile.am | 4 +- tests/compile/test-app-ctx/Makefile.am | 4 +- tests/unit/libmsgpack/Makefile.am | 4 +- tests/unit/libmsgpack/test_msgpack.c | 2 +- tests/unit/libringbuffer/Makefile.am | 8 +- tests/unit/libringbuffer/shm.c | 2 +- tests/unit/pthread_name/Makefile.am | 2 +- tests/unit/pthread_name/pthread_name.c | 2 +- tests/unit/snprintf/Makefile.am | 3 +- tests/unit/ust-elf/Makefile.am | 3 +- tests/unit/ust-error/Makefile.am | 3 +- tests/unit/ust-utils/Makefile.am | 6 +- 267 files changed, 276 insertions(+), 184 deletions(-) create mode 100644 src/Makefile.am rename {libcounter => src/libcounter}/Makefile.am (100%) rename {libcounter => src/libcounter}/counter-api.h (100%) rename {libcounter => src/libcounter}/counter-config.h (100%) rename {libcounter => src/libcounter}/counter-internal.h (100%) rename {libcounter => src/libcounter}/counter-types.h (100%) rename {libcounter => src/libcounter}/counter.c (100%) rename {libcounter => src/libcounter}/counter.h (100%) rename {libcounter => src/libcounter}/shm.c (100%) rename {libcounter => src/libcounter}/shm.h (100%) rename {libcounter => src/libcounter}/shm_internal.h (100%) rename {libcounter => src/libcounter}/shm_types.h (100%) rename {libcounter => src/libcounter}/smp.c (100%) rename {libcounter => src/libcounter}/smp.h (100%) rename {liblttng-ust-comm => src/liblttng-ust-comm}/Makefile.am (100%) rename {liblttng-ust-comm => src/liblttng-ust-comm}/lttng-ust-comm.c (100%) rename {liblttng-ust-comm => src/liblttng-ust-comm}/lttng-ust-fd-tracker.c (100%) rename {liblttng-ust-ctl => src/liblttng-ust-ctl}/Makefile.am (63%) rename {liblttng-ust-ctl => src/liblttng-ust-ctl}/ustctl.c (100%) rename {liblttng-ust-cyg-profile => src/liblttng-ust-cyg-profile}/Makefile.am (86%) rename {liblttng-ust-cyg-profile => src/liblttng-ust-cyg-profile}/lttng-ust-cyg-profile-fast.c (100%) rename {liblttng-ust-cyg-profile => src/liblttng-ust-cyg-profile}/lttng-ust-cyg-profile-fast.h (100%) rename {liblttng-ust-cyg-profile => src/liblttng-ust-cyg-profile}/lttng-ust-cyg-profile.c (100%) rename {liblttng-ust-cyg-profile => src/liblttng-ust-cyg-profile}/lttng-ust-cyg-profile.h (100%) rename {liblttng-ust-cyg-profile => src/liblttng-ust-cyg-profile}/run (100%) rename {liblttng-ust-cyg-profile => src/liblttng-ust-cyg-profile}/run-fast (100%) rename {liblttng-ust-dl => src/liblttng-ust-dl}/Makefile.am (79%) rename {liblttng-ust-dl => src/liblttng-ust-dl}/lttng-ust-dl.c (100%) rename {liblttng-ust-dl => src/liblttng-ust-dl}/ust_dl.c (100%) rename {liblttng-ust-dl => src/liblttng-ust-dl}/ust_dl.h (100%) rename {liblttng-ust-fd => src/liblttng-ust-fd}/Makefile.am (84%) rename {liblttng-ust-fd => src/liblttng-ust-fd}/lttng-ust-fd.c (100%) rename {liblttng-ust-fork => src/liblttng-ust-fork}/Makefile.am (87%) rename {liblttng-ust-fork => src/liblttng-ust-fork}/ustfork.c (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/Makefile.am (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/Makefile.am (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-all/Makefile.am (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-all/Manifest.txt (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/Makefile.am (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/Manifest.txt (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/AbstractLttngAgent.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/EventNamePattern.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngAgent.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngHandler.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/LTTngAgent.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/ILttngTcpClientListener.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngAgentResponse.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngTcpSessiondClient.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommand.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommandHeader.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableAppContextCommand.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableEventCommand.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableAppContextCommand.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableEventCommand.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondListLoggersCommand.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoManager.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoSerializer.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/context/IContextInfoRetriever.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/context/LttngContextApi.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/FilterChangeNotifier.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/IFilterChangeListener.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/session/EventRule.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/session/LogLevelSelector.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-common/org/lttng/ust/agent/utils/LttngUstAgentLogger.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-jul/Makefile.am (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-jul/Manifest.txt (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulAgent.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulApi.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngLogHandler.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-log4j/Makefile.am (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-log4j/Manifest.txt (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jAgent.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jApi.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLogAppender.java (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/jni/Makefile.am (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/jni/common/Makefile.am (87%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/jni/common/lttng_ust_context.c (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/jni/common/lttng_ust_context.h (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/jni/jul/Makefile.am (70%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/jni/jul/lttng_ust_jul.c (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/jni/jul/lttng_ust_jul.h (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/jni/log4j/Makefile.am (71%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/jni/log4j/lttng_ust_log4j.c (100%) rename {liblttng-ust-java-agent => src/liblttng-ust-java-agent}/jni/log4j/lttng_ust_log4j.h (100%) rename {liblttng-ust-java => src/liblttng-ust-java}/.gitignore (100%) rename {liblttng-ust-java => src/liblttng-ust-java}/LTTngUst.c (100%) rename {liblttng-ust-java => src/liblttng-ust-java}/Makefile.am (95%) rename {liblttng-ust-java => src/liblttng-ust-java}/README (100%) rename {liblttng-ust-java => src/liblttng-ust-java}/lttng_ust_java.h (100%) rename {liblttng-ust-java => src/liblttng-ust-java}/org/lttng/ust/LTTngUst.java (100%) rename {liblttng-ust-libc-wrapper => src/liblttng-ust-libc-wrapper}/Makefile.am (86%) rename {liblttng-ust-libc-wrapper => src/liblttng-ust-libc-wrapper}/README (100%) rename {liblttng-ust-libc-wrapper => src/liblttng-ust-libc-wrapper}/lttng-ust-malloc.c (100%) rename {liblttng-ust-libc-wrapper => src/liblttng-ust-libc-wrapper}/lttng-ust-pthread.c (100%) rename {liblttng-ust-libc-wrapper => src/liblttng-ust-libc-wrapper}/run (100%) rename {liblttng-ust-libc-wrapper => src/liblttng-ust-libc-wrapper}/ust_libc.h (100%) rename {liblttng-ust-libc-wrapper => src/liblttng-ust-libc-wrapper}/ust_pthread.h (100%) rename {liblttng-ust-python-agent => src/liblttng-ust-python-agent}/Makefile.am (81%) rename {liblttng-ust-python-agent => src/liblttng-ust-python-agent}/lttng_ust_python.c (100%) rename {liblttng-ust-python-agent => src/liblttng-ust-python-agent}/lttng_ust_python.h (100%) rename {liblttng-ust => src/liblttng-ust}/Makefile.am (91%) rename {liblttng-ust => src/liblttng-ust}/bytecode.h (100%) rename {liblttng-ust => src/liblttng-ust}/clock.h (100%) rename {liblttng-ust => src/liblttng-ust}/compat.h (100%) rename {liblttng-ust => src/liblttng-ust}/compat_futex.c (100%) rename {liblttng-ust => src/liblttng-ust}/context-internal.h (100%) rename {liblttng-ust => src/liblttng-ust}/context-provider-internal.h (100%) rename {liblttng-ust => src/liblttng-ust}/creds.h (100%) rename {liblttng-ust => src/liblttng-ust}/error.h (100%) rename {liblttng-ust => src/liblttng-ust}/event-notifier-notification.c (100%) rename {liblttng-ust => src/liblttng-ust}/futex.h (100%) rename {liblttng-ust => src/liblttng-ust}/getenv.c (100%) rename {liblttng-ust => src/liblttng-ust}/getenv.h (100%) rename {liblttng-ust => src/liblttng-ust}/jhash.h (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-bytecode-interpreter.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-bytecode-specialize.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-bytecode-validator.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-bytecode.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-bytecode.h (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-clock.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-cgroup-ns.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-cpu-id.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-ip.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-ipc-ns.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-mnt-ns.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-net-ns.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-perf-counters.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-pid-ns.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-procname.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-provider.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-pthread-id.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-time-ns.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-user-ns.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-uts-ns.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-vegid.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-veuid.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-vgid.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-vpid.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-vsgid.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-vsuid.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-vtid.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context-vuid.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-context.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-counter-client-percpu-32-modular.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-counter-client-percpu-64-modular.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-counter-client.h (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-events.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-getcpu.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-hash-helper.h (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-probes.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-rb-clients.h (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ring-buffer-client-discard-rt.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ring-buffer-client-discard.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ring-buffer-client-overwrite-rt.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ring-buffer-client-overwrite.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ring-buffer-client-template.h (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ring-buffer-metadata-client-template.h (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ring-buffer-metadata-client.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-tracer-core.h (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-tracer.h (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ust-abi.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ust-comm.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ust-dynamic-type.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ust-elf.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ust-elf.h (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ust-statedump-provider.h (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ust-statedump.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ust-statedump.h (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ust-tracef-provider.h (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ust-tracelog-provider.h (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ust-urcu-pointer.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ust-urcu.c (100%) rename {liblttng-ust => src/liblttng-ust}/lttng-ust-uuid.h (100%) rename {liblttng-ust => src/liblttng-ust}/ns.h (100%) rename {liblttng-ust => src/liblttng-ust}/perf_event.h (100%) rename {liblttng-ust => src/liblttng-ust}/rculfhash-internal.h (100%) rename {liblttng-ust => src/liblttng-ust}/rculfhash-mm-chunk.c (100%) rename {liblttng-ust => src/liblttng-ust}/rculfhash-mm-mmap.c (100%) rename {liblttng-ust => src/liblttng-ust}/rculfhash-mm-order.c (100%) rename {liblttng-ust => src/liblttng-ust}/rculfhash.c (100%) rename {liblttng-ust => src/liblttng-ust}/rculfhash.h (100%) rename {liblttng-ust => src/liblttng-ust}/string-utils.c (100%) rename {liblttng-ust => src/liblttng-ust}/string-utils.h (100%) rename {liblttng-ust => src/liblttng-ust}/tracef.c (100%) rename {liblttng-ust => src/liblttng-ust}/tracelog.c (100%) rename {liblttng-ust => src/liblttng-ust}/tracepoint-internal.h (100%) rename {liblttng-ust => src/liblttng-ust}/tracepoint-weak-test.c (100%) rename {liblttng-ust => src/liblttng-ust}/tracepoint.c (100%) rename {liblttng-ust => src/liblttng-ust}/ust-core.c (100%) rename {liblttng-ust => src/liblttng-ust}/ust-events-internal.h (100%) rename {liblttng-ust => src/liblttng-ust}/ust_lib.c (100%) rename {liblttng-ust => src/liblttng-ust}/ust_lib.h (100%) rename {liblttng-ust => src/liblttng-ust}/wait.h (100%) rename {libmsgpack => src/libmsgpack}/Makefile.am (100%) rename {libmsgpack => src/libmsgpack}/msgpack.c (100%) rename {libmsgpack => src/libmsgpack}/msgpack.h (100%) rename {libringbuffer => src/libringbuffer}/Makefile.am (100%) rename {libringbuffer => src/libringbuffer}/api.h (100%) rename {libringbuffer => src/libringbuffer}/backend.h (100%) rename {libringbuffer => src/libringbuffer}/backend_internal.h (100%) rename {libringbuffer => src/libringbuffer}/backend_types.h (100%) rename {libringbuffer => src/libringbuffer}/frontend.h (100%) rename {libringbuffer => src/libringbuffer}/frontend_api.h (100%) rename {libringbuffer => src/libringbuffer}/frontend_internal.h (100%) rename {libringbuffer => src/libringbuffer}/frontend_types.h (100%) rename {libringbuffer => src/libringbuffer}/getcpu.h (100%) rename {libringbuffer => src/libringbuffer}/mmap.h (100%) rename {libringbuffer => src/libringbuffer}/nohz.h (100%) rename {libringbuffer => src/libringbuffer}/rb-init.h (100%) rename {libringbuffer => src/libringbuffer}/ring_buffer_backend.c (100%) rename {libringbuffer => src/libringbuffer}/ring_buffer_frontend.c (100%) rename {libringbuffer => src/libringbuffer}/ringbuffer-config.h (100%) rename {libringbuffer => src/libringbuffer}/shm.c (100%) rename {libringbuffer => src/libringbuffer}/shm.h (100%) rename {libringbuffer => src/libringbuffer}/shm_internal.h (100%) rename {libringbuffer => src/libringbuffer}/shm_types.h (100%) rename {libringbuffer => src/libringbuffer}/smp.c (100%) rename {libringbuffer => src/libringbuffer}/smp.h (100%) rename {libringbuffer => src/libringbuffer}/vatomic.h (100%) rename lttng-ust-ctl.pc.in => src/lttng-ust-ctl.pc.in (100%) rename lttng-ust.pc.in => src/lttng-ust.pc.in (100%) rename {python-lttngust => src/python-lttngust}/Makefile.am (100%) rename {python-lttngust => src/python-lttngust}/lttngust/__init__.py (100%) rename {python-lttngust => src/python-lttngust}/lttngust/agent.py (100%) rename {python-lttngust => src/python-lttngust}/lttngust/cmd.py (100%) rename {python-lttngust => src/python-lttngust}/lttngust/compat.py (100%) rename {python-lttngust => src/python-lttngust}/lttngust/debug.py (100%) rename {python-lttngust => src/python-lttngust}/lttngust/loghandler.py (100%) rename {python-lttngust => src/python-lttngust}/lttngust/version.py.in (100%) rename {python-lttngust => src/python-lttngust}/setup.py.in (100%) rename {snprintf => src/snprintf}/Makefile.am (100%) rename {snprintf => src/snprintf}/README (100%) rename {snprintf => src/snprintf}/core.c (100%) rename {snprintf => src/snprintf}/fflush.c (100%) rename {snprintf => src/snprintf}/fileext.h (100%) rename {snprintf => src/snprintf}/floatio.h (100%) rename {snprintf => src/snprintf}/fvwrite.c (100%) rename {snprintf => src/snprintf}/fvwrite.h (100%) rename {snprintf => src/snprintf}/local.h (100%) rename {snprintf => src/snprintf}/mbrtowc_sb.c (100%) rename {snprintf => src/snprintf}/patient_write.c (100%) rename {snprintf => src/snprintf}/snprintf.c (100%) rename {snprintf => src/snprintf}/various.h (100%) rename {snprintf => src/snprintf}/vfprintf.c (100%) rename {snprintf => src/snprintf}/wcio.h (100%) rename {snprintf => src/snprintf}/wsetup.c (100%) diff --git a/.gitignore b/.gitignore index 8732df01..7bf195fb 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ *.swo *.trs *.log -Makefile .libs/ .deps/ *~ @@ -14,10 +13,12 @@ Makefile Makefile.in *.loT *.info +*.class cscope.* -configure + +/configure /aclocal.m4 -autom4te.cache/ +/autom4te.cache /include/config.h /include/config.h.in /include/stamp-h1 @@ -25,6 +26,7 @@ autom4te.cache/ /include/lttng/stamp-h3 /include/lttng/ust-version.h /include/lttng/ust-config.h + /config/ar-lib /config/compile /config/config.guess @@ -36,76 +38,134 @@ autom4te.cache/ /config/ltmain.sh /config/missing /config/test-driver + /m4/libtool.m4 /m4/lt~obsolete.m4 /m4/ltoptions.m4 /m4/ltsugar.m4 /m4/ltversion.m4 -config.log -config.status + +/config.log +/config.status /libtool -lttng-ust.pc -lttng-ust-ctl.pc -ustctl/ustctl -ust-consumerd/ust-consumerd +/src/lttng-ust.pc +/src/lttng-ust-ctl.pc -doc/examples/demo/demo -doc/examples/easy-ust/sample -doc/examples/hello-static-lib/hello -doc/examples/gen-tp/sample -doc/examples/gen-tp/sample_tracepoint.h -doc/examples/demo-tracef/demo-tracef -doc/examples/demo-tracef/demo-vtracef -doc/examples/demo-tracelog/demo-tracelog -doc/examples/demo-tracelog/demo-vtracelog -doc/examples/cmake-multiple-shared-libraries/build/ +/doc/examples/demo/demo +/doc/examples/easy-ust/sample +/doc/examples/hello-static-lib/hello +/doc/examples/gen-tp/sample +/doc/examples/gen-tp/sample_tracepoint.h +/doc/examples/demo-tracef/demo-tracef +/doc/examples/demo-tracef/demo-vtracef +/doc/examples/demo-tracelog/demo-tracelog +/doc/examples/demo-tracelog/demo-vtracelog +/doc/examples/cmake-multiple-shared-libraries/build/ -doc/man/*.xml -doc/man/lttng-gen-tp.1 -doc/man/lttng-ust-cyg-profile.3 -doc/man/lttng-ust-dl.3 -doc/man/lttng-ust.3 -doc/man/tracef.3 -doc/man/tracelog.3 -doc/man/vtracef.3 -doc/man/vtracelog.3 +/doc/man/*.xml +/doc/man/lttng-gen-tp.1 +/doc/man/lttng-ust-cyg-profile.3 +/doc/man/lttng-ust-dl.3 +/doc/man/lttng-ust.3 +/doc/man/tracef.3 +/doc/man/tracelog.3 +/doc/man/vtracef.3 +/doc/man/vtracelog.3 -tests/benchmark/bench1 -tests/benchmark/bench2 -tests/compile/ctf-types/ctf-types -tests/compile/hello.cxx/hello -tests/compile/hello/hello -tests/compile/hello-many/hello-many -tests/compile/same_line_tracepoint/same_line_tracepoint -tests/compile/test-app-ctx/hello -tests/unit/gcc-weak-hidden/test_gcc_weak_hidden -tests/unit/libmsgpack/test_msgpack -tests/unit/libringbuffer/test_shm -tests/unit/pthread_name/test_pthread_name -tests/unit/snprintf/test_snprintf -tests/unit/ust-elf/ust-elf -tests/unit/ust-error/test_ust_error -tests/unit/ust-utils/test_ust_utils -tests/unit/ust-utils/test_ust_utils_cxx +/tests/benchmark/bench1 +/tests/benchmark/bench2 +/tests/compile/ctf-types/ctf-types +/tests/compile/hello.cxx/hello +/tests/compile/hello/hello +/tests/compile/hello-many/hello-many +/tests/compile/same_line_tracepoint/same_line_tracepoint +/tests/compile/test-app-ctx/hello +/tests/unit/gcc-weak-hidden/test_gcc_weak_hidden +/tests/unit/libmsgpack/test_msgpack +/tests/unit/libringbuffer/test_shm +/tests/unit/pthread_name/test_pthread_name +/tests/unit/snprintf/test_snprintf +/tests/unit/ust-elf/ust-elf +/tests/unit/ust-error/test_ust_error +/tests/unit/ust-utils/test_ust_utils +/tests/unit/ust-utils/test_ust_utils_cxx # Java agent library -*.class -lttng-ust-agent*.jar -liblttng-ust-agent.jar -classnoinst.stamp -jni-header.stamp -context-jni-header.stamp -jul-jni-header.stamp -log4j-jni-header.stamp -org_lttng_ust_agent_context_LttngContextApi.h -org_lttng_ust_agent_jul_LttngJulApi.h -org_lttng_ust_agent_log4j_LttngLog4jApi.h +/src/liblttng-ust-java-agent/java/lttng-ust-agent-all/*.jar +/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/classnoinst.stamp +/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/context-jni-header.stamp +/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/*.jar +/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/classnoinst.stamp +/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/jul-jni-header.stamp +/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/*.jar +/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/classnoinst.stamp +/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/log4j-jni-header.stamp +/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/*.jar +/src/liblttng-ust-java-agent/jni/common/org_lttng_ust_agent_context_LttngContextApi.h +/src/liblttng-ust-java-agent/jni/jul/org_lttng_ust_agent_jul_LttngJulApi.h +/src/liblttng-ust-java-agent/jni/log4j/org_lttng_ust_agent_log4j_LttngLog4jApi.h +/src/liblttng-ust-java/classnoinst.stamp +/src/liblttng-ust-java/jni-header.stamp # Python agent -python-lttngust/lttngust/version.py -python-lttngust/**/*.pyc -python-lttngust/build -python-lttngust/setup.py -python-lttngust/build-python-bindings.stamp -python-lttngust/copy-static-deps.stamp +/src/python-lttngust/lttngust/version.py +/src/python-lttngust/**/*.pyc +/src/python-lttngust/build +/src/python-lttngust/setup.py +/src/python-lttngust/build-python-bindings.stamp +/src/python-lttngust/copy-static-deps.stamp +/src/python-lttngust/installed_files.txt + +# Makefiles +/Makefile +/doc/Makefile +/doc/examples/Makefile +/doc/man/Makefile +/include/Makefile +/src/libcounter/Makefile +/src/liblttng-ust-comm/Makefile +/src/liblttng-ust-ctl/Makefile +/src/liblttng-ust-cyg-profile/Makefile +/src/liblttng-ust-dl/Makefile +/src/liblttng-ust-fd/Makefile +/src/liblttng-ust-fork/Makefile +/src/liblttng-ust-java-agent/Makefile +/src/liblttng-ust-java-agent/java/Makefile +/src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile +/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile +/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile +/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile +/src/liblttng-ust-java-agent/jni/Makefile +/src/liblttng-ust-java-agent/jni/common/Makefile +/src/liblttng-ust-java-agent/jni/jul/Makefile +/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/liblttng-ust/Makefile +/src/libmsgpack/Makefile +/src/libringbuffer/Makefile +/src/python-lttngust/Makefile +/src/snprintf/Makefile +/src/Makefile +/tests/Makefile +/tests/benchmark/Makefile +/tests/compile/Makefile +/tests/compile/ctf-types/Makefile +/tests/compile/hello-many/Makefile +/tests/compile/hello.cxx/Makefile +/tests/compile/hello/Makefile +/tests/compile/same_line_tracepoint/Makefile +/tests/compile/test-app-ctx/Makefile +/tests/unit/Makefile +/tests/unit/gcc-weak-hidden/Makefile +/tests/unit/libmsgpack/Makefile +/tests/unit/libringbuffer/Makefile +/tests/unit/pthread_name/Makefile +/tests/unit/snprintf/Makefile +/tests/unit/ust-elf/Makefile +/tests/unit/ust-error/Makefile +/tests/unit/ust-utils/Makefile +/tests/utils/Makefile +/tools/Makefile diff --git a/Makefile.am b/Makefile.am index 9d362f42..e1896c18 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,38 +2,12 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \ - libcounter \ - libmsgpack \ - liblttng-ust \ - liblttng-ust-ctl \ - liblttng-ust-fd \ - liblttng-ust-fork \ - liblttng-ust-libc-wrapper \ - liblttng-ust-cyg-profile \ - tools - -if ENABLE_UST_DL -SUBDIRS += liblttng-ust-dl -endif - -if ENABLE_JNI_INTERFACE -SUBDIRS += liblttng-ust-java -endif - -if ENABLE_JAVA_AGENT -SUBDIRS += liblttng-ust-java-agent -endif - -if ENABLE_PYTHON_AGENT -SUBDIRS += python-lttngust \ - liblttng-ust-python-agent -endif - -SUBDIRS += tests doc - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = lttng-ust.pc lttng-ust-ctl.pc +SUBDIRS = \ + include \ + src \ + tools \ + doc \ + tests dist_doc_DATA = \ ChangeLog \ diff --git a/configure.ac b/configure.ac index 6bb13b88..99b99852 100644 --- a/configure.ac +++ b/configure.ac @@ -514,59 +514,60 @@ AC_SUBST(JNI_CPPFLAGS) # List of files to be generated from '.in' templates by AC_OUTPUT AC_CONFIG_FILES([ Makefile - doc/Makefile doc/examples/Makefile + doc/Makefile doc/man/Makefile include/Makefile - snprintf/Makefile - libcounter/Makefile - libmsgpack/Makefile - libringbuffer/Makefile - liblttng-ust-comm/Makefile - liblttng-ust/Makefile - liblttng-ust-ctl/Makefile - liblttng-ust-fork/Makefile - liblttng-ust-dl/Makefile - liblttng-ust-fd/Makefile - liblttng-ust-java/Makefile - liblttng-ust-java-agent/Makefile - liblttng-ust-java-agent/java/Makefile - liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile - liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile - liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile - liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile - liblttng-ust-java-agent/jni/Makefile - liblttng-ust-java-agent/jni/common/Makefile - liblttng-ust-java-agent/jni/jul/Makefile - liblttng-ust-java-agent/jni/log4j/Makefile - liblttng-ust-libc-wrapper/Makefile - liblttng-ust-cyg-profile/Makefile - liblttng-ust-python-agent/Makefile - python-lttngust/Makefile - python-lttngust/setup.py - python-lttngust/lttngust/version.py - tools/Makefile - tests/Makefile - tests/compile/Makefile + src/libcounter/Makefile + src/liblttng-ust-comm/Makefile + src/liblttng-ust-ctl/Makefile + src/liblttng-ust-cyg-profile/Makefile + src/liblttng-ust-dl/Makefile + src/liblttng-ust-fd/Makefile + src/liblttng-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 + src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile + src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile + src/liblttng-ust-java-agent/java/Makefile + src/liblttng-ust-java-agent/jni/common/Makefile + src/liblttng-ust-java-agent/jni/jul/Makefile + src/liblttng-ust-java-agent/jni/log4j/Makefile + src/liblttng-ust-java-agent/jni/Makefile + src/liblttng-ust-java-agent/Makefile + src/liblttng-ust-java/Makefile + src/liblttng-ust-libc-wrapper/Makefile + src/liblttng-ust/Makefile + src/liblttng-ust-python-agent/Makefile + src/libmsgpack/Makefile + src/libringbuffer/Makefile + src/lttng-ust-ctl.pc + src/lttng-ust.pc + src/Makefile + src/python-lttngust/lttngust/version.py + src/python-lttngust/Makefile + src/python-lttngust/setup.py + src/snprintf/Makefile + tests/benchmark/Makefile tests/compile/ctf-types/Makefile tests/compile/hello.cxx/Makefile tests/compile/hello/Makefile tests/compile/hello-many/Makefile + tests/compile/Makefile tests/compile/same_line_tracepoint/Makefile tests/compile/test-app-ctx/Makefile - tests/benchmark/Makefile + tests/Makefile tests/unit/gcc-weak-hidden/Makefile tests/unit/libmsgpack/Makefile - tests/unit/Makefile tests/unit/libringbuffer/Makefile + tests/unit/Makefile tests/unit/pthread_name/Makefile tests/unit/snprintf/Makefile tests/unit/ust-elf/Makefile tests/unit/ust-error/Makefile tests/unit/ust-utils/Makefile tests/utils/Makefile - lttng-ust.pc - lttng-ust-ctl.pc + tools/Makefile ]) AC_OUTPUT diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index c16210f4..93132f6a 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -140,7 +140,7 @@ all-local: CFLAGS='$(CFLAGS)' \ AM_CFLAGS='$(AM_CFLAGS)' \ LDFLAGS="$(LDFLAGS)" \ - AM_LDFLAGS='$(AM_LDFLAGS) -L../../../liblttng-ust/.libs -Wl,-rpath="$(PWD)/../../liblttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../liblttng-ust/.libs/"' \ + AM_LDFLAGS='$(AM_LDFLAGS) -L../../../src/liblttng-ust/.libs -Wl,-rpath="$(PWD)/../../src/liblttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../src/liblttng-ust/.libs/"' \ LTTNG_GEN_TP_PATH="$$rel_src_subdir$(top_srcdir)/tools/" \ AM_V_P="$(AM_V_P)" \ AM_V_at="$(AM_V_at)" \ @@ -153,8 +153,8 @@ all-local: cd $$subdir && \ $(MAKE) all \ CLASSPATH="$(CLASSPATH)" \ - JAVA_CLASSPATH_OVERRIDE_JUL="../../../liblttng-ust-java-agent/java/lttng-ust-agent-jul" \ - JAVA_CLASSPATH_OVERRIDE_COMMON="../../../liblttng-ust-java-agent/java/lttng-ust-agent-common" \ + JAVA_CLASSPATH_OVERRIDE_JUL="../../../src/liblttng-ust-java-agent/java/lttng-ust-agent-jul" \ + JAVA_CLASSPATH_OVERRIDE_COMMON="../../../src/liblttng-ust-java-agent/java/lttng-ust-agent-common" \ $(AM_MAKEFLAGS) \ ) || exit 1; \ done; \ @@ -165,8 +165,8 @@ all-local: cd $$subdir && \ $(MAKE) all \ CLASSPATH="$(CLASSPATH)" \ - JAVA_CLASSPATH_OVERRIDE_LOG4J="../../../liblttng-ust-java-agent/java/lttng-ust-agent-log4j" \ - JAVA_CLASSPATH_OVERRIDE_COMMON="../../../liblttng-ust-java-agent/java/lttng-ust-agent-common" \ + JAVA_CLASSPATH_OVERRIDE_LOG4J="../../../src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j" \ + JAVA_CLASSPATH_OVERRIDE_COMMON="../../../src/liblttng-ust-java-agent/java/lttng-ust-agent-common" \ $(AM_MAKEFLAGS) \ ) || exit 1; \ done; \ @@ -182,7 +182,7 @@ all-local: CXX="$(CXX)" \ $(CMAKE) \ -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \ - -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \ + -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/src/liblttng-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 new file mode 100644 index 00000000..87fcdb8f --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: LGPL-2.1-only + +SUBDIRS = \ + snprintf \ + libringbuffer \ + liblttng-ust-comm \ + libcounter \ + libmsgpack \ + liblttng-ust \ + liblttng-ust-ctl \ + liblttng-ust-fd \ + liblttng-ust-fork \ + liblttng-ust-libc-wrapper \ + liblttng-ust-cyg-profile + +if ENABLE_UST_DL +SUBDIRS += liblttng-ust-dl +endif + +if ENABLE_JNI_INTERFACE +SUBDIRS += liblttng-ust-java +endif + +if ENABLE_JAVA_AGENT +SUBDIRS += liblttng-ust-java-agent +endif + +if ENABLE_PYTHON_AGENT +SUBDIRS += \ + python-lttngust \ + liblttng-ust-python-agent +endif + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = lttng-ust.pc lttng-ust-ctl.pc diff --git a/libcounter/Makefile.am b/src/libcounter/Makefile.am similarity index 100% rename from libcounter/Makefile.am rename to src/libcounter/Makefile.am diff --git a/libcounter/counter-api.h b/src/libcounter/counter-api.h similarity index 100% rename from libcounter/counter-api.h rename to src/libcounter/counter-api.h diff --git a/libcounter/counter-config.h b/src/libcounter/counter-config.h similarity index 100% rename from libcounter/counter-config.h rename to src/libcounter/counter-config.h diff --git a/libcounter/counter-internal.h b/src/libcounter/counter-internal.h similarity index 100% rename from libcounter/counter-internal.h rename to src/libcounter/counter-internal.h diff --git a/libcounter/counter-types.h b/src/libcounter/counter-types.h similarity index 100% rename from libcounter/counter-types.h rename to src/libcounter/counter-types.h diff --git a/libcounter/counter.c b/src/libcounter/counter.c similarity index 100% rename from libcounter/counter.c rename to src/libcounter/counter.c diff --git a/libcounter/counter.h b/src/libcounter/counter.h similarity index 100% rename from libcounter/counter.h rename to src/libcounter/counter.h diff --git a/libcounter/shm.c b/src/libcounter/shm.c similarity index 100% rename from libcounter/shm.c rename to src/libcounter/shm.c diff --git a/libcounter/shm.h b/src/libcounter/shm.h similarity index 100% rename from libcounter/shm.h rename to src/libcounter/shm.h diff --git a/libcounter/shm_internal.h b/src/libcounter/shm_internal.h similarity index 100% rename from libcounter/shm_internal.h rename to src/libcounter/shm_internal.h diff --git a/libcounter/shm_types.h b/src/libcounter/shm_types.h similarity index 100% rename from libcounter/shm_types.h rename to src/libcounter/shm_types.h diff --git a/libcounter/smp.c b/src/libcounter/smp.c similarity index 100% rename from libcounter/smp.c rename to src/libcounter/smp.c diff --git a/libcounter/smp.h b/src/libcounter/smp.h similarity index 100% rename from libcounter/smp.h rename to src/libcounter/smp.h diff --git a/liblttng-ust-comm/Makefile.am b/src/liblttng-ust-comm/Makefile.am similarity index 100% rename from liblttng-ust-comm/Makefile.am rename to src/liblttng-ust-comm/Makefile.am diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/src/liblttng-ust-comm/lttng-ust-comm.c similarity index 100% rename from liblttng-ust-comm/lttng-ust-comm.c rename to src/liblttng-ust-comm/lttng-ust-comm.c diff --git a/liblttng-ust-comm/lttng-ust-fd-tracker.c b/src/liblttng-ust-comm/lttng-ust-fd-tracker.c similarity index 100% rename from liblttng-ust-comm/lttng-ust-fd-tracker.c rename to src/liblttng-ust-comm/lttng-ust-fd-tracker.c diff --git a/liblttng-ust-ctl/Makefile.am b/src/liblttng-ust-ctl/Makefile.am similarity index 63% rename from liblttng-ust-ctl/Makefile.am rename to src/liblttng-ust-ctl/Makefile.am index 3ffd4052..30c3879a 100644 --- a/liblttng-ust-ctl/Makefile.am +++ b/src/liblttng-ust-ctl/Makefile.am @@ -10,7 +10,7 @@ liblttng_ust_ctl_la_LDFLAGS = \ -version-info $(LTTNG_UST_CTL_LIBRARY_VERSION) liblttng_ust_ctl_la_LIBADD = \ - $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \ - $(top_builddir)/liblttng-ust/liblttng-ust-support.la \ - $(top_builddir)/snprintf/libustsnprintf.la \ - -ldl + $(top_builddir)/src/liblttng-ust-comm/liblttng-ust-comm.la \ + $(top_builddir)/src/liblttng-ust/liblttng-ust-support.la \ + $(top_builddir)/src/snprintf/libustsnprintf.la \ + $(DL_LIBS) diff --git a/liblttng-ust-ctl/ustctl.c b/src/liblttng-ust-ctl/ustctl.c similarity index 100% rename from liblttng-ust-ctl/ustctl.c rename to src/liblttng-ust-ctl/ustctl.c diff --git a/liblttng-ust-cyg-profile/Makefile.am b/src/liblttng-ust-cyg-profile/Makefile.am similarity index 86% rename from liblttng-ust-cyg-profile/Makefile.am rename to src/liblttng-ust-cyg-profile/Makefile.am index d1aa7444..7e8b226f 100644 --- a/liblttng-ust-cyg-profile/Makefile.am +++ b/src/liblttng-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)/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/liblttng-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)/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ $(DL_LIBS) liblttng_ust_cyg_profile_fast_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) diff --git a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.c b/src/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.c similarity index 100% rename from liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.c rename to src/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.c diff --git a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h b/src/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h similarity index 100% rename from liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h rename to src/liblttng-ust-cyg-profile/lttng-ust-cyg-profile-fast.h diff --git a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c b/src/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c similarity index 100% rename from liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c rename to src/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.c diff --git a/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.h b/src/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.h similarity index 100% rename from liblttng-ust-cyg-profile/lttng-ust-cyg-profile.h rename to src/liblttng-ust-cyg-profile/lttng-ust-cyg-profile.h diff --git a/liblttng-ust-cyg-profile/run b/src/liblttng-ust-cyg-profile/run similarity index 100% rename from liblttng-ust-cyg-profile/run rename to src/liblttng-ust-cyg-profile/run diff --git a/liblttng-ust-cyg-profile/run-fast b/src/liblttng-ust-cyg-profile/run-fast similarity index 100% rename from liblttng-ust-cyg-profile/run-fast rename to src/liblttng-ust-cyg-profile/run-fast diff --git a/liblttng-ust-dl/Makefile.am b/src/liblttng-ust-dl/Makefile.am similarity index 79% rename from liblttng-ust-dl/Makefile.am rename to src/liblttng-ust-dl/Makefile.am index ef670220..3e919f7d 100644 --- a/liblttng-ust-dl/Makefile.am +++ b/src/liblttng-ust-dl/Makefile.am @@ -9,8 +9,8 @@ liblttng_ust_dl_la_SOURCES = \ ust_dl.h liblttng_ust_dl_la_LIBADD = \ - $(top_builddir)/liblttng-ust/liblttng-ust.la \ - $(top_builddir)/snprintf/libustsnprintf.la \ + $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/snprintf/libustsnprintf.la \ $(DL_LIBS) liblttng_ust_dl_la_CFLAGS = -DUST_COMPONENT=liblttng-ust-dl $(AM_CFLAGS) diff --git a/liblttng-ust-dl/lttng-ust-dl.c b/src/liblttng-ust-dl/lttng-ust-dl.c similarity index 100% rename from liblttng-ust-dl/lttng-ust-dl.c rename to src/liblttng-ust-dl/lttng-ust-dl.c diff --git a/liblttng-ust-dl/ust_dl.c b/src/liblttng-ust-dl/ust_dl.c similarity index 100% rename from liblttng-ust-dl/ust_dl.c rename to src/liblttng-ust-dl/ust_dl.c diff --git a/liblttng-ust-dl/ust_dl.h b/src/liblttng-ust-dl/ust_dl.h similarity index 100% rename from liblttng-ust-dl/ust_dl.h rename to src/liblttng-ust-dl/ust_dl.h diff --git a/liblttng-ust-fd/Makefile.am b/src/liblttng-ust-fd/Makefile.am similarity index 84% rename from liblttng-ust-fd/Makefile.am rename to src/liblttng-ust-fd/Makefile.am index 99e27bd9..6571b112 100644 --- a/liblttng-ust-fd/Makefile.am +++ b/src/liblttng-ust-fd/Makefile.am @@ -7,7 +7,7 @@ liblttng_ust_fd_la_SOURCES = \ lttng-ust-fd.c liblttng_ust_fd_la_LIBADD = \ - $(top_builddir)/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ $(DL_LIBS) liblttng_ust_fd_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) diff --git a/liblttng-ust-fd/lttng-ust-fd.c b/src/liblttng-ust-fd/lttng-ust-fd.c similarity index 100% rename from liblttng-ust-fd/lttng-ust-fd.c rename to src/liblttng-ust-fd/lttng-ust-fd.c diff --git a/liblttng-ust-fork/Makefile.am b/src/liblttng-ust-fork/Makefile.am similarity index 87% rename from liblttng-ust-fork/Makefile.am rename to src/liblttng-ust-fork/Makefile.am index c8f4d8ab..b5feca4b 100644 --- a/liblttng-ust-fork/Makefile.am +++ b/src/liblttng-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)/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ $(DL_LIBS) liblttng_ust_fork_la_CFLAGS = -DUST_COMPONENT=liblttng-ust-fork $(AM_CFLAGS) diff --git a/liblttng-ust-fork/ustfork.c b/src/liblttng-ust-fork/ustfork.c similarity index 100% rename from liblttng-ust-fork/ustfork.c rename to src/liblttng-ust-fork/ustfork.c diff --git a/liblttng-ust-java-agent/Makefile.am b/src/liblttng-ust-java-agent/Makefile.am similarity index 100% rename from liblttng-ust-java-agent/Makefile.am rename to src/liblttng-ust-java-agent/Makefile.am diff --git a/liblttng-ust-java-agent/java/Makefile.am b/src/liblttng-ust-java-agent/java/Makefile.am similarity index 100% rename from liblttng-ust-java-agent/java/Makefile.am rename to src/liblttng-ust-java-agent/java/Makefile.am diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am b/src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile.am diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-all/Manifest.txt b/src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Manifest.txt similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-all/Manifest.txt rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Manifest.txt diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/Manifest.txt b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/Manifest.txt similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/Manifest.txt rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/Manifest.txt diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/AbstractLttngAgent.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/AbstractLttngAgent.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/AbstractLttngAgent.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/AbstractLttngAgent.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/EventNamePattern.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/EventNamePattern.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/EventNamePattern.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/EventNamePattern.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngAgent.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngAgent.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngAgent.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngAgent.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngHandler.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngHandler.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngHandler.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/ILttngHandler.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/LTTngAgent.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/LTTngAgent.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/LTTngAgent.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/LTTngAgent.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/ILttngTcpClientListener.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/ILttngTcpClientListener.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/ILttngTcpClientListener.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/ILttngTcpClientListener.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngAgentResponse.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngAgentResponse.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngAgentResponse.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngAgentResponse.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngTcpSessiondClient.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngTcpSessiondClient.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngTcpSessiondClient.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/LttngTcpSessiondClient.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommand.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommand.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommand.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommand.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommandHeader.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommandHeader.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommandHeader.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommandHeader.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableAppContextCommand.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableAppContextCommand.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableAppContextCommand.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableAppContextCommand.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableEventCommand.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableEventCommand.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableEventCommand.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableEventCommand.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableAppContextCommand.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableAppContextCommand.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableAppContextCommand.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableAppContextCommand.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableEventCommand.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableEventCommand.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableEventCommand.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondEnableEventCommand.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondListLoggersCommand.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondListLoggersCommand.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondListLoggersCommand.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondListLoggersCommand.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoManager.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoManager.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoManager.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoManager.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoSerializer.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoSerializer.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoSerializer.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/ContextInfoSerializer.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/IContextInfoRetriever.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/IContextInfoRetriever.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/IContextInfoRetriever.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/IContextInfoRetriever.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/LttngContextApi.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/LttngContextApi.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/LttngContextApi.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/context/LttngContextApi.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/FilterChangeNotifier.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/FilterChangeNotifier.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/FilterChangeNotifier.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/FilterChangeNotifier.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/IFilterChangeListener.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/IFilterChangeListener.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/IFilterChangeListener.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/filter/IFilterChangeListener.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/session/EventRule.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/session/EventRule.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/session/EventRule.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/session/EventRule.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/session/LogLevelSelector.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/session/LogLevelSelector.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/session/LogLevelSelector.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/session/LogLevelSelector.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/utils/LttngUstAgentLogger.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/utils/LttngUstAgentLogger.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/utils/LttngUstAgentLogger.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/utils/LttngUstAgentLogger.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am b/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Manifest.txt b/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Manifest.txt similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-jul/Manifest.txt rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Manifest.txt diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulAgent.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulAgent.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulAgent.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulAgent.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulApi.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulApi.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulApi.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngJulApi.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngLogHandler.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngLogHandler.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngLogHandler.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/org/lttng/ust/agent/jul/LttngLogHandler.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am b/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Manifest.txt b/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Manifest.txt similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Manifest.txt rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Manifest.txt diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jAgent.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jAgent.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jAgent.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jAgent.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jApi.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jApi.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jApi.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLog4jApi.java diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLogAppender.java b/src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLogAppender.java similarity index 100% rename from liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLogAppender.java rename to src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/org/lttng/ust/agent/log4j/LttngLogAppender.java diff --git a/liblttng-ust-java-agent/jni/Makefile.am b/src/liblttng-ust-java-agent/jni/Makefile.am similarity index 100% rename from liblttng-ust-java-agent/jni/Makefile.am rename to src/liblttng-ust-java-agent/jni/Makefile.am diff --git a/liblttng-ust-java-agent/jni/common/Makefile.am b/src/liblttng-ust-java-agent/jni/common/Makefile.am similarity index 87% rename from liblttng-ust-java-agent/jni/common/Makefile.am rename to src/liblttng-ust-java-agent/jni/common/Makefile.am index 271cacc0..c066157b 100644 --- a/liblttng-ust-java-agent/jni/common/Makefile.am +++ b/src/liblttng-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)/liblttng-ust/liblttng-ust.la + $(top_builddir)/src/liblttng-ust/liblttng-ust.la diff --git a/liblttng-ust-java-agent/jni/common/lttng_ust_context.c b/src/liblttng-ust-java-agent/jni/common/lttng_ust_context.c similarity index 100% rename from liblttng-ust-java-agent/jni/common/lttng_ust_context.c rename to src/liblttng-ust-java-agent/jni/common/lttng_ust_context.c diff --git a/liblttng-ust-java-agent/jni/common/lttng_ust_context.h b/src/liblttng-ust-java-agent/jni/common/lttng_ust_context.h similarity index 100% rename from liblttng-ust-java-agent/jni/common/lttng_ust_context.h rename to src/liblttng-ust-java-agent/jni/common/lttng_ust_context.h diff --git a/liblttng-ust-java-agent/jni/jul/Makefile.am b/src/liblttng-ust-java-agent/jni/jul/Makefile.am similarity index 70% rename from liblttng-ust-java-agent/jni/jul/Makefile.am rename to src/liblttng-ust-java-agent/jni/jul/Makefile.am index 5ada0adc..32089ae3 100644 --- a/liblttng-ust-java-agent/jni/jul/Makefile.am +++ b/src/liblttng-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)/liblttng-ust/liblttng-ust.la \ - $(top_builddir)/liblttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la + $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/liblttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la diff --git a/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c b/src/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c similarity index 100% rename from liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c rename to src/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.c diff --git a/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.h b/src/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.h similarity index 100% rename from liblttng-ust-java-agent/jni/jul/lttng_ust_jul.h rename to src/liblttng-ust-java-agent/jni/jul/lttng_ust_jul.h diff --git a/liblttng-ust-java-agent/jni/log4j/Makefile.am b/src/liblttng-ust-java-agent/jni/log4j/Makefile.am similarity index 71% rename from liblttng-ust-java-agent/jni/log4j/Makefile.am rename to src/liblttng-ust-java-agent/jni/log4j/Makefile.am index 2f9f3d24..383bb9cb 100644 --- a/liblttng-ust-java-agent/jni/log4j/Makefile.am +++ b/src/liblttng-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)/liblttng-ust/liblttng-ust.la \ - $(top_builddir)/liblttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la + $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/liblttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la diff --git a/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c b/src/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c similarity index 100% rename from liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c rename to src/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.c diff --git a/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h b/src/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h similarity index 100% rename from liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h rename to src/liblttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h diff --git a/liblttng-ust-java/.gitignore b/src/liblttng-ust-java/.gitignore similarity index 100% rename from liblttng-ust-java/.gitignore rename to src/liblttng-ust-java/.gitignore diff --git a/liblttng-ust-java/LTTngUst.c b/src/liblttng-ust-java/LTTngUst.c similarity index 100% rename from liblttng-ust-java/LTTngUst.c rename to src/liblttng-ust-java/LTTngUst.c diff --git a/liblttng-ust-java/Makefile.am b/src/liblttng-ust-java/Makefile.am similarity index 95% rename from liblttng-ust-java/Makefile.am rename to src/liblttng-ust-java/Makefile.am index 13298eb3..55252fbb 100644 --- a/liblttng-ust-java/Makefile.am +++ b/src/liblttng-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)/liblttng-ust/liblttng-ust.la + $(top_builddir)/src/liblttng-ust/liblttng-ust.la $(jarfile): classnoinst.stamp $(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class diff --git a/liblttng-ust-java/README b/src/liblttng-ust-java/README similarity index 100% rename from liblttng-ust-java/README rename to src/liblttng-ust-java/README diff --git a/liblttng-ust-java/lttng_ust_java.h b/src/liblttng-ust-java/lttng_ust_java.h similarity index 100% rename from liblttng-ust-java/lttng_ust_java.h rename to src/liblttng-ust-java/lttng_ust_java.h diff --git a/liblttng-ust-java/org/lttng/ust/LTTngUst.java b/src/liblttng-ust-java/org/lttng/ust/LTTngUst.java similarity index 100% rename from liblttng-ust-java/org/lttng/ust/LTTngUst.java rename to src/liblttng-ust-java/org/lttng/ust/LTTngUst.java diff --git a/liblttng-ust-libc-wrapper/Makefile.am b/src/liblttng-ust-libc-wrapper/Makefile.am similarity index 86% rename from liblttng-ust-libc-wrapper/Makefile.am rename to src/liblttng-ust-libc-wrapper/Makefile.am index e63d6889..6b02142d 100644 --- a/liblttng-ust-libc-wrapper/Makefile.am +++ b/src/liblttng-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)/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/liblttng-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)/liblttng-ust/liblttng-ust.la \ + $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ $(DL_LIBS) liblttng_ust_pthread_wrapper_la_LDFLAGS = -version-info $(LTTNG_UST_LIBRARY_VERSION) diff --git a/liblttng-ust-libc-wrapper/README b/src/liblttng-ust-libc-wrapper/README similarity index 100% rename from liblttng-ust-libc-wrapper/README rename to src/liblttng-ust-libc-wrapper/README diff --git a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c b/src/liblttng-ust-libc-wrapper/lttng-ust-malloc.c similarity index 100% rename from liblttng-ust-libc-wrapper/lttng-ust-malloc.c rename to src/liblttng-ust-libc-wrapper/lttng-ust-malloc.c diff --git a/liblttng-ust-libc-wrapper/lttng-ust-pthread.c b/src/liblttng-ust-libc-wrapper/lttng-ust-pthread.c similarity index 100% rename from liblttng-ust-libc-wrapper/lttng-ust-pthread.c rename to src/liblttng-ust-libc-wrapper/lttng-ust-pthread.c diff --git a/liblttng-ust-libc-wrapper/run b/src/liblttng-ust-libc-wrapper/run similarity index 100% rename from liblttng-ust-libc-wrapper/run rename to src/liblttng-ust-libc-wrapper/run diff --git a/liblttng-ust-libc-wrapper/ust_libc.h b/src/liblttng-ust-libc-wrapper/ust_libc.h similarity index 100% rename from liblttng-ust-libc-wrapper/ust_libc.h rename to src/liblttng-ust-libc-wrapper/ust_libc.h diff --git a/liblttng-ust-libc-wrapper/ust_pthread.h b/src/liblttng-ust-libc-wrapper/ust_pthread.h similarity index 100% rename from liblttng-ust-libc-wrapper/ust_pthread.h rename to src/liblttng-ust-libc-wrapper/ust_pthread.h diff --git a/liblttng-ust-python-agent/Makefile.am b/src/liblttng-ust-python-agent/Makefile.am similarity index 81% rename from liblttng-ust-python-agent/Makefile.am rename to src/liblttng-ust-python-agent/Makefile.am index e5de2e0b..f0ce5890 100644 --- a/liblttng-ust-python-agent/Makefile.am +++ b/src/liblttng-ust-python-agent/Makefile.am @@ -6,8 +6,9 @@ AM_CFLAGS += -I$(srcdir) -fno-strict-aliasing 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)/liblttng-ust/liblttng-ust.la +liblttng_ust_python_agent_la_LIBADD = \ + -lc \ + $(top_builddir)/src/liblttng-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/liblttng-ust-python-agent/lttng_ust_python.c b/src/liblttng-ust-python-agent/lttng_ust_python.c similarity index 100% rename from liblttng-ust-python-agent/lttng_ust_python.c rename to src/liblttng-ust-python-agent/lttng_ust_python.c diff --git a/liblttng-ust-python-agent/lttng_ust_python.h b/src/liblttng-ust-python-agent/lttng_ust_python.h similarity index 100% rename from liblttng-ust-python-agent/lttng_ust_python.h rename to src/liblttng-ust-python-agent/lttng_ust_python.h diff --git a/liblttng-ust/Makefile.am b/src/liblttng-ust/Makefile.am similarity index 91% rename from liblttng-ust/Makefile.am rename to src/liblttng-ust/Makefile.am index a3c6df33..5d94be61 100644 --- a/liblttng-ust/Makefile.am +++ b/src/liblttng-ust/Makefile.am @@ -22,7 +22,7 @@ liblttng_ust_tracepoint_la_SOURCES = \ liblttng_ust_tracepoint_la_LIBADD = \ liblttng-ust-common.la \ - $(top_builddir)/snprintf/libustsnprintf.la \ + $(top_builddir)/src/snprintf/libustsnprintf.la \ $(DL_LIBS) liblttng_ust_tracepoint_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION) @@ -129,17 +129,17 @@ liblttng_ust_la_SOURCES = liblttng_ust_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION) liblttng_ust_support_la_LIBADD = \ - $(top_builddir)/libringbuffer/libringbuffer.la \ - $(top_builddir)/libcounter/libcounter.la + $(top_builddir)/src/libringbuffer/libringbuffer.la \ + $(top_builddir)/src/libcounter/libcounter.la liblttng_ust_la_LIBADD = \ -lrt \ liblttng-ust-common.la \ - $(top_builddir)/snprintf/libustsnprintf.la \ - $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \ + $(top_builddir)/src/snprintf/libustsnprintf.la \ + $(top_builddir)/src/liblttng-ust-comm/liblttng-ust-comm.la \ liblttng-ust-tracepoint.la \ liblttng-ust-runtime.la liblttng-ust-support.la \ - $(top_builddir)/libmsgpack/libmsgpack.la \ + $(top_builddir)/src/libmsgpack/libmsgpack.la \ $(DL_LIBS) liblttng_ust_la_CFLAGS = -DUST_COMPONENT="liblttng_ust" $(AM_CFLAGS) diff --git a/liblttng-ust/bytecode.h b/src/liblttng-ust/bytecode.h similarity index 100% rename from liblttng-ust/bytecode.h rename to src/liblttng-ust/bytecode.h diff --git a/liblttng-ust/clock.h b/src/liblttng-ust/clock.h similarity index 100% rename from liblttng-ust/clock.h rename to src/liblttng-ust/clock.h diff --git a/liblttng-ust/compat.h b/src/liblttng-ust/compat.h similarity index 100% rename from liblttng-ust/compat.h rename to src/liblttng-ust/compat.h diff --git a/liblttng-ust/compat_futex.c b/src/liblttng-ust/compat_futex.c similarity index 100% rename from liblttng-ust/compat_futex.c rename to src/liblttng-ust/compat_futex.c diff --git a/liblttng-ust/context-internal.h b/src/liblttng-ust/context-internal.h similarity index 100% rename from liblttng-ust/context-internal.h rename to src/liblttng-ust/context-internal.h diff --git a/liblttng-ust/context-provider-internal.h b/src/liblttng-ust/context-provider-internal.h similarity index 100% rename from liblttng-ust/context-provider-internal.h rename to src/liblttng-ust/context-provider-internal.h diff --git a/liblttng-ust/creds.h b/src/liblttng-ust/creds.h similarity index 100% rename from liblttng-ust/creds.h rename to src/liblttng-ust/creds.h diff --git a/liblttng-ust/error.h b/src/liblttng-ust/error.h similarity index 100% rename from liblttng-ust/error.h rename to src/liblttng-ust/error.h diff --git a/liblttng-ust/event-notifier-notification.c b/src/liblttng-ust/event-notifier-notification.c similarity index 100% rename from liblttng-ust/event-notifier-notification.c rename to src/liblttng-ust/event-notifier-notification.c diff --git a/liblttng-ust/futex.h b/src/liblttng-ust/futex.h similarity index 100% rename from liblttng-ust/futex.h rename to src/liblttng-ust/futex.h diff --git a/liblttng-ust/getenv.c b/src/liblttng-ust/getenv.c similarity index 100% rename from liblttng-ust/getenv.c rename to src/liblttng-ust/getenv.c diff --git a/liblttng-ust/getenv.h b/src/liblttng-ust/getenv.h similarity index 100% rename from liblttng-ust/getenv.h rename to src/liblttng-ust/getenv.h diff --git a/liblttng-ust/jhash.h b/src/liblttng-ust/jhash.h similarity index 100% rename from liblttng-ust/jhash.h rename to src/liblttng-ust/jhash.h diff --git a/liblttng-ust/lttng-bytecode-interpreter.c b/src/liblttng-ust/lttng-bytecode-interpreter.c similarity index 100% rename from liblttng-ust/lttng-bytecode-interpreter.c rename to src/liblttng-ust/lttng-bytecode-interpreter.c diff --git a/liblttng-ust/lttng-bytecode-specialize.c b/src/liblttng-ust/lttng-bytecode-specialize.c similarity index 100% rename from liblttng-ust/lttng-bytecode-specialize.c rename to src/liblttng-ust/lttng-bytecode-specialize.c diff --git a/liblttng-ust/lttng-bytecode-validator.c b/src/liblttng-ust/lttng-bytecode-validator.c similarity index 100% rename from liblttng-ust/lttng-bytecode-validator.c rename to src/liblttng-ust/lttng-bytecode-validator.c diff --git a/liblttng-ust/lttng-bytecode.c b/src/liblttng-ust/lttng-bytecode.c similarity index 100% rename from liblttng-ust/lttng-bytecode.c rename to src/liblttng-ust/lttng-bytecode.c diff --git a/liblttng-ust/lttng-bytecode.h b/src/liblttng-ust/lttng-bytecode.h similarity index 100% rename from liblttng-ust/lttng-bytecode.h rename to src/liblttng-ust/lttng-bytecode.h diff --git a/liblttng-ust/lttng-clock.c b/src/liblttng-ust/lttng-clock.c similarity index 100% rename from liblttng-ust/lttng-clock.c rename to src/liblttng-ust/lttng-clock.c diff --git a/liblttng-ust/lttng-context-cgroup-ns.c b/src/liblttng-ust/lttng-context-cgroup-ns.c similarity index 100% rename from liblttng-ust/lttng-context-cgroup-ns.c rename to src/liblttng-ust/lttng-context-cgroup-ns.c diff --git a/liblttng-ust/lttng-context-cpu-id.c b/src/liblttng-ust/lttng-context-cpu-id.c similarity index 100% rename from liblttng-ust/lttng-context-cpu-id.c rename to src/liblttng-ust/lttng-context-cpu-id.c diff --git a/liblttng-ust/lttng-context-ip.c b/src/liblttng-ust/lttng-context-ip.c similarity index 100% rename from liblttng-ust/lttng-context-ip.c rename to src/liblttng-ust/lttng-context-ip.c diff --git a/liblttng-ust/lttng-context-ipc-ns.c b/src/liblttng-ust/lttng-context-ipc-ns.c similarity index 100% rename from liblttng-ust/lttng-context-ipc-ns.c rename to src/liblttng-ust/lttng-context-ipc-ns.c diff --git a/liblttng-ust/lttng-context-mnt-ns.c b/src/liblttng-ust/lttng-context-mnt-ns.c similarity index 100% rename from liblttng-ust/lttng-context-mnt-ns.c rename to src/liblttng-ust/lttng-context-mnt-ns.c diff --git a/liblttng-ust/lttng-context-net-ns.c b/src/liblttng-ust/lttng-context-net-ns.c similarity index 100% rename from liblttng-ust/lttng-context-net-ns.c rename to src/liblttng-ust/lttng-context-net-ns.c diff --git a/liblttng-ust/lttng-context-perf-counters.c b/src/liblttng-ust/lttng-context-perf-counters.c similarity index 100% rename from liblttng-ust/lttng-context-perf-counters.c rename to src/liblttng-ust/lttng-context-perf-counters.c diff --git a/liblttng-ust/lttng-context-pid-ns.c b/src/liblttng-ust/lttng-context-pid-ns.c similarity index 100% rename from liblttng-ust/lttng-context-pid-ns.c rename to src/liblttng-ust/lttng-context-pid-ns.c diff --git a/liblttng-ust/lttng-context-procname.c b/src/liblttng-ust/lttng-context-procname.c similarity index 100% rename from liblttng-ust/lttng-context-procname.c rename to src/liblttng-ust/lttng-context-procname.c diff --git a/liblttng-ust/lttng-context-provider.c b/src/liblttng-ust/lttng-context-provider.c similarity index 100% rename from liblttng-ust/lttng-context-provider.c rename to src/liblttng-ust/lttng-context-provider.c diff --git a/liblttng-ust/lttng-context-pthread-id.c b/src/liblttng-ust/lttng-context-pthread-id.c similarity index 100% rename from liblttng-ust/lttng-context-pthread-id.c rename to src/liblttng-ust/lttng-context-pthread-id.c diff --git a/liblttng-ust/lttng-context-time-ns.c b/src/liblttng-ust/lttng-context-time-ns.c similarity index 100% rename from liblttng-ust/lttng-context-time-ns.c rename to src/liblttng-ust/lttng-context-time-ns.c diff --git a/liblttng-ust/lttng-context-user-ns.c b/src/liblttng-ust/lttng-context-user-ns.c similarity index 100% rename from liblttng-ust/lttng-context-user-ns.c rename to src/liblttng-ust/lttng-context-user-ns.c diff --git a/liblttng-ust/lttng-context-uts-ns.c b/src/liblttng-ust/lttng-context-uts-ns.c similarity index 100% rename from liblttng-ust/lttng-context-uts-ns.c rename to src/liblttng-ust/lttng-context-uts-ns.c diff --git a/liblttng-ust/lttng-context-vegid.c b/src/liblttng-ust/lttng-context-vegid.c similarity index 100% rename from liblttng-ust/lttng-context-vegid.c rename to src/liblttng-ust/lttng-context-vegid.c diff --git a/liblttng-ust/lttng-context-veuid.c b/src/liblttng-ust/lttng-context-veuid.c similarity index 100% rename from liblttng-ust/lttng-context-veuid.c rename to src/liblttng-ust/lttng-context-veuid.c diff --git a/liblttng-ust/lttng-context-vgid.c b/src/liblttng-ust/lttng-context-vgid.c similarity index 100% rename from liblttng-ust/lttng-context-vgid.c rename to src/liblttng-ust/lttng-context-vgid.c diff --git a/liblttng-ust/lttng-context-vpid.c b/src/liblttng-ust/lttng-context-vpid.c similarity index 100% rename from liblttng-ust/lttng-context-vpid.c rename to src/liblttng-ust/lttng-context-vpid.c diff --git a/liblttng-ust/lttng-context-vsgid.c b/src/liblttng-ust/lttng-context-vsgid.c similarity index 100% rename from liblttng-ust/lttng-context-vsgid.c rename to src/liblttng-ust/lttng-context-vsgid.c diff --git a/liblttng-ust/lttng-context-vsuid.c b/src/liblttng-ust/lttng-context-vsuid.c similarity index 100% rename from liblttng-ust/lttng-context-vsuid.c rename to src/liblttng-ust/lttng-context-vsuid.c diff --git a/liblttng-ust/lttng-context-vtid.c b/src/liblttng-ust/lttng-context-vtid.c similarity index 100% rename from liblttng-ust/lttng-context-vtid.c rename to src/liblttng-ust/lttng-context-vtid.c diff --git a/liblttng-ust/lttng-context-vuid.c b/src/liblttng-ust/lttng-context-vuid.c similarity index 100% rename from liblttng-ust/lttng-context-vuid.c rename to src/liblttng-ust/lttng-context-vuid.c diff --git a/liblttng-ust/lttng-context.c b/src/liblttng-ust/lttng-context.c similarity index 100% rename from liblttng-ust/lttng-context.c rename to src/liblttng-ust/lttng-context.c diff --git a/liblttng-ust/lttng-counter-client-percpu-32-modular.c b/src/liblttng-ust/lttng-counter-client-percpu-32-modular.c similarity index 100% rename from liblttng-ust/lttng-counter-client-percpu-32-modular.c rename to src/liblttng-ust/lttng-counter-client-percpu-32-modular.c diff --git a/liblttng-ust/lttng-counter-client-percpu-64-modular.c b/src/liblttng-ust/lttng-counter-client-percpu-64-modular.c similarity index 100% rename from liblttng-ust/lttng-counter-client-percpu-64-modular.c rename to src/liblttng-ust/lttng-counter-client-percpu-64-modular.c diff --git a/liblttng-ust/lttng-counter-client.h b/src/liblttng-ust/lttng-counter-client.h similarity index 100% rename from liblttng-ust/lttng-counter-client.h rename to src/liblttng-ust/lttng-counter-client.h diff --git a/liblttng-ust/lttng-events.c b/src/liblttng-ust/lttng-events.c similarity index 100% rename from liblttng-ust/lttng-events.c rename to src/liblttng-ust/lttng-events.c diff --git a/liblttng-ust/lttng-getcpu.c b/src/liblttng-ust/lttng-getcpu.c similarity index 100% rename from liblttng-ust/lttng-getcpu.c rename to src/liblttng-ust/lttng-getcpu.c diff --git a/liblttng-ust/lttng-hash-helper.h b/src/liblttng-ust/lttng-hash-helper.h similarity index 100% rename from liblttng-ust/lttng-hash-helper.h rename to src/liblttng-ust/lttng-hash-helper.h diff --git a/liblttng-ust/lttng-probes.c b/src/liblttng-ust/lttng-probes.c similarity index 100% rename from liblttng-ust/lttng-probes.c rename to src/liblttng-ust/lttng-probes.c diff --git a/liblttng-ust/lttng-rb-clients.h b/src/liblttng-ust/lttng-rb-clients.h similarity index 100% rename from liblttng-ust/lttng-rb-clients.h rename to src/liblttng-ust/lttng-rb-clients.h diff --git a/liblttng-ust/lttng-ring-buffer-client-discard-rt.c b/src/liblttng-ust/lttng-ring-buffer-client-discard-rt.c similarity index 100% rename from liblttng-ust/lttng-ring-buffer-client-discard-rt.c rename to src/liblttng-ust/lttng-ring-buffer-client-discard-rt.c diff --git a/liblttng-ust/lttng-ring-buffer-client-discard.c b/src/liblttng-ust/lttng-ring-buffer-client-discard.c similarity index 100% rename from liblttng-ust/lttng-ring-buffer-client-discard.c rename to src/liblttng-ust/lttng-ring-buffer-client-discard.c diff --git a/liblttng-ust/lttng-ring-buffer-client-overwrite-rt.c b/src/liblttng-ust/lttng-ring-buffer-client-overwrite-rt.c similarity index 100% rename from liblttng-ust/lttng-ring-buffer-client-overwrite-rt.c rename to src/liblttng-ust/lttng-ring-buffer-client-overwrite-rt.c diff --git a/liblttng-ust/lttng-ring-buffer-client-overwrite.c b/src/liblttng-ust/lttng-ring-buffer-client-overwrite.c similarity index 100% rename from liblttng-ust/lttng-ring-buffer-client-overwrite.c rename to src/liblttng-ust/lttng-ring-buffer-client-overwrite.c diff --git a/liblttng-ust/lttng-ring-buffer-client-template.h b/src/liblttng-ust/lttng-ring-buffer-client-template.h similarity index 100% rename from liblttng-ust/lttng-ring-buffer-client-template.h rename to src/liblttng-ust/lttng-ring-buffer-client-template.h diff --git a/liblttng-ust/lttng-ring-buffer-metadata-client-template.h b/src/liblttng-ust/lttng-ring-buffer-metadata-client-template.h similarity index 100% rename from liblttng-ust/lttng-ring-buffer-metadata-client-template.h rename to src/liblttng-ust/lttng-ring-buffer-metadata-client-template.h diff --git a/liblttng-ust/lttng-ring-buffer-metadata-client.c b/src/liblttng-ust/lttng-ring-buffer-metadata-client.c similarity index 100% rename from liblttng-ust/lttng-ring-buffer-metadata-client.c rename to src/liblttng-ust/lttng-ring-buffer-metadata-client.c diff --git a/liblttng-ust/lttng-tracer-core.h b/src/liblttng-ust/lttng-tracer-core.h similarity index 100% rename from liblttng-ust/lttng-tracer-core.h rename to src/liblttng-ust/lttng-tracer-core.h diff --git a/liblttng-ust/lttng-tracer.h b/src/liblttng-ust/lttng-tracer.h similarity index 100% rename from liblttng-ust/lttng-tracer.h rename to src/liblttng-ust/lttng-tracer.h diff --git a/liblttng-ust/lttng-ust-abi.c b/src/liblttng-ust/lttng-ust-abi.c similarity index 100% rename from liblttng-ust/lttng-ust-abi.c rename to src/liblttng-ust/lttng-ust-abi.c diff --git a/liblttng-ust/lttng-ust-comm.c b/src/liblttng-ust/lttng-ust-comm.c similarity index 100% rename from liblttng-ust/lttng-ust-comm.c rename to src/liblttng-ust/lttng-ust-comm.c diff --git a/liblttng-ust/lttng-ust-dynamic-type.c b/src/liblttng-ust/lttng-ust-dynamic-type.c similarity index 100% rename from liblttng-ust/lttng-ust-dynamic-type.c rename to src/liblttng-ust/lttng-ust-dynamic-type.c diff --git a/liblttng-ust/lttng-ust-elf.c b/src/liblttng-ust/lttng-ust-elf.c similarity index 100% rename from liblttng-ust/lttng-ust-elf.c rename to src/liblttng-ust/lttng-ust-elf.c diff --git a/liblttng-ust/lttng-ust-elf.h b/src/liblttng-ust/lttng-ust-elf.h similarity index 100% rename from liblttng-ust/lttng-ust-elf.h rename to src/liblttng-ust/lttng-ust-elf.h diff --git a/liblttng-ust/lttng-ust-statedump-provider.h b/src/liblttng-ust/lttng-ust-statedump-provider.h similarity index 100% rename from liblttng-ust/lttng-ust-statedump-provider.h rename to src/liblttng-ust/lttng-ust-statedump-provider.h diff --git a/liblttng-ust/lttng-ust-statedump.c b/src/liblttng-ust/lttng-ust-statedump.c similarity index 100% rename from liblttng-ust/lttng-ust-statedump.c rename to src/liblttng-ust/lttng-ust-statedump.c diff --git a/liblttng-ust/lttng-ust-statedump.h b/src/liblttng-ust/lttng-ust-statedump.h similarity index 100% rename from liblttng-ust/lttng-ust-statedump.h rename to src/liblttng-ust/lttng-ust-statedump.h diff --git a/liblttng-ust/lttng-ust-tracef-provider.h b/src/liblttng-ust/lttng-ust-tracef-provider.h similarity index 100% rename from liblttng-ust/lttng-ust-tracef-provider.h rename to src/liblttng-ust/lttng-ust-tracef-provider.h diff --git a/liblttng-ust/lttng-ust-tracelog-provider.h b/src/liblttng-ust/lttng-ust-tracelog-provider.h similarity index 100% rename from liblttng-ust/lttng-ust-tracelog-provider.h rename to src/liblttng-ust/lttng-ust-tracelog-provider.h diff --git a/liblttng-ust/lttng-ust-urcu-pointer.c b/src/liblttng-ust/lttng-ust-urcu-pointer.c similarity index 100% rename from liblttng-ust/lttng-ust-urcu-pointer.c rename to src/liblttng-ust/lttng-ust-urcu-pointer.c diff --git a/liblttng-ust/lttng-ust-urcu.c b/src/liblttng-ust/lttng-ust-urcu.c similarity index 100% rename from liblttng-ust/lttng-ust-urcu.c rename to src/liblttng-ust/lttng-ust-urcu.c diff --git a/liblttng-ust/lttng-ust-uuid.h b/src/liblttng-ust/lttng-ust-uuid.h similarity index 100% rename from liblttng-ust/lttng-ust-uuid.h rename to src/liblttng-ust/lttng-ust-uuid.h diff --git a/liblttng-ust/ns.h b/src/liblttng-ust/ns.h similarity index 100% rename from liblttng-ust/ns.h rename to src/liblttng-ust/ns.h diff --git a/liblttng-ust/perf_event.h b/src/liblttng-ust/perf_event.h similarity index 100% rename from liblttng-ust/perf_event.h rename to src/liblttng-ust/perf_event.h diff --git a/liblttng-ust/rculfhash-internal.h b/src/liblttng-ust/rculfhash-internal.h similarity index 100% rename from liblttng-ust/rculfhash-internal.h rename to src/liblttng-ust/rculfhash-internal.h diff --git a/liblttng-ust/rculfhash-mm-chunk.c b/src/liblttng-ust/rculfhash-mm-chunk.c similarity index 100% rename from liblttng-ust/rculfhash-mm-chunk.c rename to src/liblttng-ust/rculfhash-mm-chunk.c diff --git a/liblttng-ust/rculfhash-mm-mmap.c b/src/liblttng-ust/rculfhash-mm-mmap.c similarity index 100% rename from liblttng-ust/rculfhash-mm-mmap.c rename to src/liblttng-ust/rculfhash-mm-mmap.c diff --git a/liblttng-ust/rculfhash-mm-order.c b/src/liblttng-ust/rculfhash-mm-order.c similarity index 100% rename from liblttng-ust/rculfhash-mm-order.c rename to src/liblttng-ust/rculfhash-mm-order.c diff --git a/liblttng-ust/rculfhash.c b/src/liblttng-ust/rculfhash.c similarity index 100% rename from liblttng-ust/rculfhash.c rename to src/liblttng-ust/rculfhash.c diff --git a/liblttng-ust/rculfhash.h b/src/liblttng-ust/rculfhash.h similarity index 100% rename from liblttng-ust/rculfhash.h rename to src/liblttng-ust/rculfhash.h diff --git a/liblttng-ust/string-utils.c b/src/liblttng-ust/string-utils.c similarity index 100% rename from liblttng-ust/string-utils.c rename to src/liblttng-ust/string-utils.c diff --git a/liblttng-ust/string-utils.h b/src/liblttng-ust/string-utils.h similarity index 100% rename from liblttng-ust/string-utils.h rename to src/liblttng-ust/string-utils.h diff --git a/liblttng-ust/tracef.c b/src/liblttng-ust/tracef.c similarity index 100% rename from liblttng-ust/tracef.c rename to src/liblttng-ust/tracef.c diff --git a/liblttng-ust/tracelog.c b/src/liblttng-ust/tracelog.c similarity index 100% rename from liblttng-ust/tracelog.c rename to src/liblttng-ust/tracelog.c diff --git a/liblttng-ust/tracepoint-internal.h b/src/liblttng-ust/tracepoint-internal.h similarity index 100% rename from liblttng-ust/tracepoint-internal.h rename to src/liblttng-ust/tracepoint-internal.h diff --git a/liblttng-ust/tracepoint-weak-test.c b/src/liblttng-ust/tracepoint-weak-test.c similarity index 100% rename from liblttng-ust/tracepoint-weak-test.c rename to src/liblttng-ust/tracepoint-weak-test.c diff --git a/liblttng-ust/tracepoint.c b/src/liblttng-ust/tracepoint.c similarity index 100% rename from liblttng-ust/tracepoint.c rename to src/liblttng-ust/tracepoint.c diff --git a/liblttng-ust/ust-core.c b/src/liblttng-ust/ust-core.c similarity index 100% rename from liblttng-ust/ust-core.c rename to src/liblttng-ust/ust-core.c diff --git a/liblttng-ust/ust-events-internal.h b/src/liblttng-ust/ust-events-internal.h similarity index 100% rename from liblttng-ust/ust-events-internal.h rename to src/liblttng-ust/ust-events-internal.h diff --git a/liblttng-ust/ust_lib.c b/src/liblttng-ust/ust_lib.c similarity index 100% rename from liblttng-ust/ust_lib.c rename to src/liblttng-ust/ust_lib.c diff --git a/liblttng-ust/ust_lib.h b/src/liblttng-ust/ust_lib.h similarity index 100% rename from liblttng-ust/ust_lib.h rename to src/liblttng-ust/ust_lib.h diff --git a/liblttng-ust/wait.h b/src/liblttng-ust/wait.h similarity index 100% rename from liblttng-ust/wait.h rename to src/liblttng-ust/wait.h diff --git a/libmsgpack/Makefile.am b/src/libmsgpack/Makefile.am similarity index 100% rename from libmsgpack/Makefile.am rename to src/libmsgpack/Makefile.am diff --git a/libmsgpack/msgpack.c b/src/libmsgpack/msgpack.c similarity index 100% rename from libmsgpack/msgpack.c rename to src/libmsgpack/msgpack.c diff --git a/libmsgpack/msgpack.h b/src/libmsgpack/msgpack.h similarity index 100% rename from libmsgpack/msgpack.h rename to src/libmsgpack/msgpack.h diff --git a/libringbuffer/Makefile.am b/src/libringbuffer/Makefile.am similarity index 100% rename from libringbuffer/Makefile.am rename to src/libringbuffer/Makefile.am diff --git a/libringbuffer/api.h b/src/libringbuffer/api.h similarity index 100% rename from libringbuffer/api.h rename to src/libringbuffer/api.h diff --git a/libringbuffer/backend.h b/src/libringbuffer/backend.h similarity index 100% rename from libringbuffer/backend.h rename to src/libringbuffer/backend.h diff --git a/libringbuffer/backend_internal.h b/src/libringbuffer/backend_internal.h similarity index 100% rename from libringbuffer/backend_internal.h rename to src/libringbuffer/backend_internal.h diff --git a/libringbuffer/backend_types.h b/src/libringbuffer/backend_types.h similarity index 100% rename from libringbuffer/backend_types.h rename to src/libringbuffer/backend_types.h diff --git a/libringbuffer/frontend.h b/src/libringbuffer/frontend.h similarity index 100% rename from libringbuffer/frontend.h rename to src/libringbuffer/frontend.h diff --git a/libringbuffer/frontend_api.h b/src/libringbuffer/frontend_api.h similarity index 100% rename from libringbuffer/frontend_api.h rename to src/libringbuffer/frontend_api.h diff --git a/libringbuffer/frontend_internal.h b/src/libringbuffer/frontend_internal.h similarity index 100% rename from libringbuffer/frontend_internal.h rename to src/libringbuffer/frontend_internal.h diff --git a/libringbuffer/frontend_types.h b/src/libringbuffer/frontend_types.h similarity index 100% rename from libringbuffer/frontend_types.h rename to src/libringbuffer/frontend_types.h diff --git a/libringbuffer/getcpu.h b/src/libringbuffer/getcpu.h similarity index 100% rename from libringbuffer/getcpu.h rename to src/libringbuffer/getcpu.h diff --git a/libringbuffer/mmap.h b/src/libringbuffer/mmap.h similarity index 100% rename from libringbuffer/mmap.h rename to src/libringbuffer/mmap.h diff --git a/libringbuffer/nohz.h b/src/libringbuffer/nohz.h similarity index 100% rename from libringbuffer/nohz.h rename to src/libringbuffer/nohz.h diff --git a/libringbuffer/rb-init.h b/src/libringbuffer/rb-init.h similarity index 100% rename from libringbuffer/rb-init.h rename to src/libringbuffer/rb-init.h diff --git a/libringbuffer/ring_buffer_backend.c b/src/libringbuffer/ring_buffer_backend.c similarity index 100% rename from libringbuffer/ring_buffer_backend.c rename to src/libringbuffer/ring_buffer_backend.c diff --git a/libringbuffer/ring_buffer_frontend.c b/src/libringbuffer/ring_buffer_frontend.c similarity index 100% rename from libringbuffer/ring_buffer_frontend.c rename to src/libringbuffer/ring_buffer_frontend.c diff --git a/libringbuffer/ringbuffer-config.h b/src/libringbuffer/ringbuffer-config.h similarity index 100% rename from libringbuffer/ringbuffer-config.h rename to src/libringbuffer/ringbuffer-config.h diff --git a/libringbuffer/shm.c b/src/libringbuffer/shm.c similarity index 100% rename from libringbuffer/shm.c rename to src/libringbuffer/shm.c diff --git a/libringbuffer/shm.h b/src/libringbuffer/shm.h similarity index 100% rename from libringbuffer/shm.h rename to src/libringbuffer/shm.h diff --git a/libringbuffer/shm_internal.h b/src/libringbuffer/shm_internal.h similarity index 100% rename from libringbuffer/shm_internal.h rename to src/libringbuffer/shm_internal.h diff --git a/libringbuffer/shm_types.h b/src/libringbuffer/shm_types.h similarity index 100% rename from libringbuffer/shm_types.h rename to src/libringbuffer/shm_types.h diff --git a/libringbuffer/smp.c b/src/libringbuffer/smp.c similarity index 100% rename from libringbuffer/smp.c rename to src/libringbuffer/smp.c diff --git a/libringbuffer/smp.h b/src/libringbuffer/smp.h similarity index 100% rename from libringbuffer/smp.h rename to src/libringbuffer/smp.h diff --git a/libringbuffer/vatomic.h b/src/libringbuffer/vatomic.h similarity index 100% rename from libringbuffer/vatomic.h rename to src/libringbuffer/vatomic.h diff --git a/lttng-ust-ctl.pc.in b/src/lttng-ust-ctl.pc.in similarity index 100% rename from lttng-ust-ctl.pc.in rename to src/lttng-ust-ctl.pc.in diff --git a/lttng-ust.pc.in b/src/lttng-ust.pc.in similarity index 100% rename from lttng-ust.pc.in rename to src/lttng-ust.pc.in diff --git a/python-lttngust/Makefile.am b/src/python-lttngust/Makefile.am similarity index 100% rename from python-lttngust/Makefile.am rename to src/python-lttngust/Makefile.am diff --git a/python-lttngust/lttngust/__init__.py b/src/python-lttngust/lttngust/__init__.py similarity index 100% rename from python-lttngust/lttngust/__init__.py rename to src/python-lttngust/lttngust/__init__.py diff --git a/python-lttngust/lttngust/agent.py b/src/python-lttngust/lttngust/agent.py similarity index 100% rename from python-lttngust/lttngust/agent.py rename to src/python-lttngust/lttngust/agent.py diff --git a/python-lttngust/lttngust/cmd.py b/src/python-lttngust/lttngust/cmd.py similarity index 100% rename from python-lttngust/lttngust/cmd.py rename to src/python-lttngust/lttngust/cmd.py diff --git a/python-lttngust/lttngust/compat.py b/src/python-lttngust/lttngust/compat.py similarity index 100% rename from python-lttngust/lttngust/compat.py rename to src/python-lttngust/lttngust/compat.py diff --git a/python-lttngust/lttngust/debug.py b/src/python-lttngust/lttngust/debug.py similarity index 100% rename from python-lttngust/lttngust/debug.py rename to src/python-lttngust/lttngust/debug.py diff --git a/python-lttngust/lttngust/loghandler.py b/src/python-lttngust/lttngust/loghandler.py similarity index 100% rename from python-lttngust/lttngust/loghandler.py rename to src/python-lttngust/lttngust/loghandler.py diff --git a/python-lttngust/lttngust/version.py.in b/src/python-lttngust/lttngust/version.py.in similarity index 100% rename from python-lttngust/lttngust/version.py.in rename to src/python-lttngust/lttngust/version.py.in diff --git a/python-lttngust/setup.py.in b/src/python-lttngust/setup.py.in similarity index 100% rename from python-lttngust/setup.py.in rename to src/python-lttngust/setup.py.in diff --git a/snprintf/Makefile.am b/src/snprintf/Makefile.am similarity index 100% rename from snprintf/Makefile.am rename to src/snprintf/Makefile.am diff --git a/snprintf/README b/src/snprintf/README similarity index 100% rename from snprintf/README rename to src/snprintf/README diff --git a/snprintf/core.c b/src/snprintf/core.c similarity index 100% rename from snprintf/core.c rename to src/snprintf/core.c diff --git a/snprintf/fflush.c b/src/snprintf/fflush.c similarity index 100% rename from snprintf/fflush.c rename to src/snprintf/fflush.c diff --git a/snprintf/fileext.h b/src/snprintf/fileext.h similarity index 100% rename from snprintf/fileext.h rename to src/snprintf/fileext.h diff --git a/snprintf/floatio.h b/src/snprintf/floatio.h similarity index 100% rename from snprintf/floatio.h rename to src/snprintf/floatio.h diff --git a/snprintf/fvwrite.c b/src/snprintf/fvwrite.c similarity index 100% rename from snprintf/fvwrite.c rename to src/snprintf/fvwrite.c diff --git a/snprintf/fvwrite.h b/src/snprintf/fvwrite.h similarity index 100% rename from snprintf/fvwrite.h rename to src/snprintf/fvwrite.h diff --git a/snprintf/local.h b/src/snprintf/local.h similarity index 100% rename from snprintf/local.h rename to src/snprintf/local.h diff --git a/snprintf/mbrtowc_sb.c b/src/snprintf/mbrtowc_sb.c similarity index 100% rename from snprintf/mbrtowc_sb.c rename to src/snprintf/mbrtowc_sb.c diff --git a/snprintf/patient_write.c b/src/snprintf/patient_write.c similarity index 100% rename from snprintf/patient_write.c rename to src/snprintf/patient_write.c diff --git a/snprintf/snprintf.c b/src/snprintf/snprintf.c similarity index 100% rename from snprintf/snprintf.c rename to src/snprintf/snprintf.c diff --git a/snprintf/various.h b/src/snprintf/various.h similarity index 100% rename from snprintf/various.h rename to src/snprintf/various.h diff --git a/snprintf/vfprintf.c b/src/snprintf/vfprintf.c similarity index 100% rename from snprintf/vfprintf.c rename to src/snprintf/vfprintf.c diff --git a/snprintf/wcio.h b/src/snprintf/wcio.h similarity index 100% rename from snprintf/wcio.h rename to src/snprintf/wcio.h diff --git a/snprintf/wsetup.c b/src/snprintf/wsetup.c similarity index 100% rename from snprintf/wsetup.c rename to src/snprintf/wsetup.c diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am index feee6a6b..9c31f0d1 100644 --- a/tests/benchmark/Makefile.am +++ b/tests/benchmark/Makefile.am @@ -4,11 +4,15 @@ AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers noinst_PROGRAMS = bench1 bench2 bench1_SOURCES = bench.c tp.c ust_tests_benchmark.h -bench1_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la $(DL_LIBS) +bench1_LDADD = \ + $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(DL_LIBS) bench2_SOURCES = bench.c tp.c ust_tests_benchmark.h -bench2_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la $(DL_LIBS) bench2_CFLAGS = -DTRACING $(AM_CFLAGS) +bench2_LDADD = \ + $(top_builddir)/src/liblttng-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 f499f23b..6104d03f 100644 --- a/tests/compile/ctf-types/Makefile.am +++ b/tests/compile/ctf-types/Makefile.am @@ -4,7 +4,9 @@ AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers noinst_PROGRAMS = ctf-types ctf_types_SOURCES = ctf-types.c tp.c ust_tests_ctf_types.h -ctf_types_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la $(DL_LIBS) ctf_types_CFLAGS = -Werror=old-style-definition $(AM_CFLAGS) +ctf_types_LDADD = \ + $(top_builddir)/src/liblttng-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 bef308b9..bf650f67 100644 --- a/tests/compile/hello-many/Makefile.am +++ b/tests/compile/hello-many/Makefile.am @@ -4,7 +4,9 @@ AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers noinst_PROGRAMS = hello-many hello_many_SOURCES = hello-many.c tp.c ust_tests_hello_many.h -hello_many_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la $(DL_LIBS) hello_many_CFLAGS = -Werror=old-style-definition $(AM_CFLAGS) +hello_many_LDADD = \ + $(top_builddir)/src/liblttng-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 b74690e4..1fc3fc94 100644 --- a/tests/compile/hello.cxx/Makefile.am +++ b/tests/compile/hello.cxx/Makefile.am @@ -4,6 +4,8 @@ AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers noinst_PROGRAMS = hello hello_SOURCES = hello.cpp tp-cpp.cpp ust_tests_hello.h -hello_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la $(DL_LIBS) +hello_LDADD = \ + $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(DL_LIBS) EXTRA_DIST = README diff --git a/tests/compile/hello/Makefile.am b/tests/compile/hello/Makefile.am index 43b89645..a8a377a5 100644 --- a/tests/compile/hello/Makefile.am +++ b/tests/compile/hello/Makefile.am @@ -4,7 +4,9 @@ AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers noinst_PROGRAMS = hello hello_SOURCES = hello.c tp.c ust_tests_hello.h -hello_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la $(DL_LIBS) hello_CFLAGS = -Werror=old-style-definition $(AM_CFLAGS) +hello_LDADD = \ + $(top_builddir)/src/liblttng-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 b7668e9f..8668d6f6 100644 --- a/tests/compile/same_line_tracepoint/Makefile.am +++ b/tests/compile/same_line_tracepoint/Makefile.am @@ -4,6 +4,8 @@ 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)/liblttng-ust/liblttng-ust.la $(DL_LIBS) +same_line_tracepoint_LDADD = \ + $(top_builddir)/src/liblttng-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 4551d92c..c913e412 100644 --- a/tests/compile/test-app-ctx/Makefile.am +++ b/tests/compile/test-app-ctx/Makefile.am @@ -4,5 +4,7 @@ AM_CPPFLAGS += -I$(srcdir) -Wsystem-headers noinst_PROGRAMS = hello hello_SOURCES = hello.c tp.c ust_tests_hello.h -hello_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la $(DL_LIBS) hello_CFLAGS = -Werror=old-style-definition $(AM_CFLAGS) +hello_LDADD = \ + $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ + $(DL_LIBS) diff --git a/tests/unit/libmsgpack/Makefile.am b/tests/unit/libmsgpack/Makefile.am index 5959947d..60afc0ec 100644 --- a/tests/unit/libmsgpack/Makefile.am +++ b/tests/unit/libmsgpack/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils noinst_PROGRAMS = test_msgpack test_msgpack_SOURCES = test_msgpack.c test_msgpack_LDADD = \ - $(top_builddir)/libmsgpack/libmsgpack.la \ - $(top_builddir)/tests/utils/libtap.a + $(top_builddir)/src/libmsgpack/libmsgpack.la \ + $(top_builddir)/tests/utils/libtap.a test_msgpack_CFLAGS = $(AM_CFLAGS) diff --git a/tests/unit/libmsgpack/test_msgpack.c b/tests/unit/libmsgpack/test_msgpack.c index f7edf033..2e1828d4 100644 --- a/tests/unit/libmsgpack/test_msgpack.c +++ b/tests/unit/libmsgpack/test_msgpack.c @@ -12,7 +12,7 @@ #include "tap.h" -#include "../../libmsgpack/msgpack.h" +#include "../../src/libmsgpack/msgpack.h" #define BUFFER_SIZE 4096 #define NUM_TESTS 23 diff --git a/tests/unit/libringbuffer/Makefile.am b/tests/unit/libringbuffer/Makefile.am index 45b98d2b..134bcb1c 100644 --- a/tests/unit/libringbuffer/Makefile.am +++ b/tests/unit/libringbuffer/Makefile.am @@ -1,11 +1,11 @@ # SPDX-License-Identifier: LGPL-2.1-only -AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/ -I$(top_srcdir)/tests/utils +AM_CPPFLAGS += -I$(top_srcdir)/tests/utils noinst_PROGRAMS = test_shm test_shm_SOURCES = shm.c test_shm_LDADD = \ - $(top_builddir)/libringbuffer/libringbuffer.la \ - $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \ - $(top_builddir)/snprintf/libustsnprintf.la \ + $(top_builddir)/src/libringbuffer/libringbuffer.la \ + $(top_builddir)/src/liblttng-ust-comm/liblttng-ust-comm.la \ + $(top_builddir)/src/snprintf/libustsnprintf.la \ $(top_builddir)/tests/utils/libtap.a diff --git a/tests/unit/libringbuffer/shm.c b/tests/unit/libringbuffer/shm.c index 60b8e6fe..d543991a 100644 --- a/tests/unit/libringbuffer/shm.c +++ b/tests/unit/libringbuffer/shm.c @@ -12,7 +12,7 @@ #include #include -#include "libringbuffer/shm.h" +#include "../../../src/libringbuffer/shm.h" #include "ust-compat.h" #include "tap.h" diff --git a/tests/unit/pthread_name/Makefile.am b/tests/unit/pthread_name/Makefile.am index 561f5248..162bfabf 100644 --- a/tests/unit/pthread_name/Makefile.am +++ b/tests/unit/pthread_name/Makefile.am @@ -1,6 +1,6 @@ # SPDX-License-Identifier: LGPL-2.1-only -AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/liblttng-ust -I$(top_srcdir)/tests/utils +AM_CPPFLAGS += -I$(top_srcdir)/liblttng-ust -I$(top_srcdir)/tests/utils noinst_PROGRAMS = test_pthread_name test_pthread_name_SOURCES = pthread_name.c diff --git a/tests/unit/pthread_name/pthread_name.c b/tests/unit/pthread_name/pthread_name.c index b48712db..6faacf68 100644 --- a/tests/unit/pthread_name/pthread_name.c +++ b/tests/unit/pthread_name/pthread_name.c @@ -6,7 +6,7 @@ #include #include -#include "compat.h" +#include "../../../src/liblttng-ust/compat.h" #include "tap.h" diff --git a/tests/unit/snprintf/Makefile.am b/tests/unit/snprintf/Makefile.am index fe2ecd86..e4af591a 100644 --- a/tests/unit/snprintf/Makefile.am +++ b/tests/unit/snprintf/Makefile.am @@ -4,7 +4,8 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils noinst_PROGRAMS = test_snprintf test_snprintf_SOURCES = snprintf.c -test_snprintf_LDADD = $(top_builddir)/snprintf/libustsnprintf.la \ +test_snprintf_LDADD = \ + $(top_builddir)/src/snprintf/libustsnprintf.la \ $(top_builddir)/tests/utils/libtap.a EXTRA_DIST = README diff --git a/tests/unit/ust-elf/Makefile.am b/tests/unit/ust-elf/Makefile.am index 339feaf1..622d70b4 100644 --- a/tests/unit/ust-elf/Makefile.am +++ b/tests/unit/ust-elf/Makefile.am @@ -4,7 +4,8 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils noinst_PROGRAMS = ust-elf ust_elf_SOURCES = ust-elf.c -ust_elf_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la \ +ust_elf_LDADD = \ + $(top_builddir)/src/liblttng-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 549b8339..3e6ff34f 100644 --- a/tests/unit/ust-error/Makefile.am +++ b/tests/unit/ust-error/Makefile.am @@ -4,5 +4,6 @@ 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)/liblttng-ust/liblttng-ust.la \ +test_ust_error_LDADD = \ + $(top_builddir)/src/liblttng-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 ec9ebe23..eb7c505e 100644 --- a/tests/unit/ust-utils/Makefile.am +++ b/tests/unit/ust-utils/Makefile.am @@ -4,12 +4,14 @@ 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)/liblttng-ust/liblttng-ust.la \ +test_ust_utils_LDADD = \ + $(top_builddir)/src/liblttng-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)/liblttng-ust/liblttng-ust.la \ +test_ust_utils_cxx_LDADD = \ + $(top_builddir)/src/liblttng-ust/liblttng-ust.la \ $(top_builddir)/tests/utils/libtap.a endif -- 2.34.1