Commit 107de372 authored Jun 11, 2013 by Robert Richter Committed by Arnaldo Carvalho de Melo Jul 08, 2013

perf tools: Fix build errors with O and DESTDIR make vars set



Fixing build errors with O and DESTDIR make vars set:

 $ make prefix=/usr/local O=$builddir DESTDIR=$destdir -C tools/ perf
 ...
 make[1]: Entering directory `.../.source/perf/tools/perf'
     CC .../.build/perf/perf/util/parse-events.o
 util/parse-events.c:14:32: fatal error: parse-events-bison.h: No such file or directory
 compilation terminated.
 make[1]: *** [.../.build/perf/perf/util/parse-events.o] Error 1
 ...

and:

     LINK /.../.build/perf/perf/perf
 gcc: error: /.../.build/perf/perf//.../.source/perf/tools/lib/lk/liblk.a: No such file or directory

Signed-off-by: Robert Richter <robert.richter@linaro.org>
Signed-off-by: Robert Richter <rric@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Robert Richter <rric@kernel.org>
Link: http://lkml.kernel.org/r/1370964158-4135-1-git-send-email-rric@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 761a0f39

tools/perf/Makefile

+2 −3

Original line number	Diff line number	Diff line
		@@ -121,17 +121,16 @@ SCRIPT_SH += perf-archive.sh
		grep-libs = $(filter -l%,$(1))
		strip-libs = $(filter-out -l%,$(1))

		LK_PATH=$(LK_DIR)

		ifneq ($(OUTPUT),)
		TE_PATH=$(OUTPUT)
		ifneq ($(subdir),)
		LK_PATH=$(OUTPUT)$(LK_DIR)
		LK_PATH=$(objtree)/lib/lk/
		else
		LK_PATH=$(OUTPUT)
		endif
		else
		TE_PATH=$(TRACE_EVENT_DIR)
		LK_PATH=$(LK_DIR)
		endif

		LIBTRACEEVENT = $(TE_PATH)libtraceevent.a

tools/perf/config/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ src-perf := $(srctree)/tools/perf
		endif

		ifeq ($(obj-perf),)
		obj-perf := $(objtree)
		obj-perf := $(OUTPUT)
		endif

		ifneq ($(obj-perf),)