From 7433d32d5a8f0e8833461b586a8c8b2274da0141 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 23 Mar 2021 10:20:09 -0400 Subject: [PATCH] cleanup: don't copy lttng-gen-tp in OOT builds No need to make a copy of lttng-gen-tp when doing an out of tree build, just use the path to the source dir in the examples Makefile. Change-Id: I485d0f9b25232d0ce46c2f7981a3ef781155c749 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- doc/examples/Makefile.am | 2 +- tools/Makefile.am | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 1dbe9f9d..d713d1ea 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -140,7 +140,7 @@ all-local: 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/"' \ - LTTNG_GEN_TP_PATH="../../../tools/" \ + LTTNG_GEN_TP_PATH="$$rel_src_subdir$(top_srcdir)/tools/" \ AM_V_P="$(AM_V_P)" \ AM_V_at="$(AM_V_at)" \ $(AM_MAKEFLAGS) \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 65e9dcf2..06bca117 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,17 +1,3 @@ # SPDX-License-Identifier: LGPL-2.1-only dist_bin_SCRIPTS = lttng-gen-tp - -all-local: - @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ - for script in $(dist_bin_SCRIPTS); do \ - cp -f $(srcdir)/$$script $(builddir); \ - done; \ - fi - -clean-local: - @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ - for script in $(dist_bin_SCRIPTS); do \ - rm -f $(builddir)/$$script; \ - done; \ - fi -- 2.34.1