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 <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 1dbe9f9dd26f8832ab940d7ffe9eea9bcf391124..d713d1eadb8108ed57e653c486c7cc537afeb7c3 100644 (file)
--- 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 65e9dcf2459e2ff84a5907e094ba62fa2a350e8b..06bca117754103fdd2bafde1fdd64e0a75e6e852 100644 (file)
--- 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