aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@linaro.org>2013-06-11 11:22:38 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-07-08 16:34:00 -0400
commit107de3724eff5a6fa6474a4d2aa5460b63749ebf (patch)
tree46ef3710a3a1e12139fd84b00c6cf23065aebfca /tools
parent761a0f395d5d8b7aafe563ecefbc8cf71a214a91 (diff)
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>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/Makefile5
-rw-r--r--tools/perf/config/Makefile2
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 203cb0eecff2..641fccddb249 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -121,17 +121,16 @@ SCRIPT_SH += perf-archive.sh
121grep-libs = $(filter -l%,$(1)) 121grep-libs = $(filter -l%,$(1))
122strip-libs = $(filter-out -l%,$(1)) 122strip-libs = $(filter-out -l%,$(1))
123 123
124LK_PATH=$(LK_DIR)
125
126ifneq ($(OUTPUT),) 124ifneq ($(OUTPUT),)
127 TE_PATH=$(OUTPUT) 125 TE_PATH=$(OUTPUT)
128ifneq ($(subdir),) 126ifneq ($(subdir),)
129 LK_PATH=$(OUTPUT)$(LK_DIR) 127 LK_PATH=$(objtree)/lib/lk/
130else 128else
131 LK_PATH=$(OUTPUT) 129 LK_PATH=$(OUTPUT)
132endif 130endif
133else 131else
134 TE_PATH=$(TRACE_EVENT_DIR) 132 TE_PATH=$(TRACE_EVENT_DIR)
133 LK_PATH=$(LK_DIR)
135endif 134endif
136 135
137LIBTRACEEVENT = $(TE_PATH)libtraceevent.a 136LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index f139dcd2796e..f4468954d3dc 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -39,7 +39,7 @@ src-perf := $(srctree)/tools/perf
39endif 39endif
40 40
41ifeq ($(obj-perf),) 41ifeq ($(obj-perf),)
42obj-perf := $(objtree) 42obj-perf := $(OUTPUT)
43endif 43endif
44 44
45ifneq ($(obj-perf),) 45ifneq ($(obj-perf),)