提交 4c7aafc9 编写于 作者: J Jiri Olsa 提交者: Arnaldo Carvalho de Melo

tools lib traceevent: Use global 'O' processing code

Using global 'O' processing code because it's already setup due to the
scripts/Makefile.include include.

Using global variable OUTPUT instead of the local BUILD_OUTPUT.
Signed-off-by: NJiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1387460527-15030-10-git-send-email-jolsa@redhat.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
上级 4a953c71
...@@ -83,18 +83,13 @@ ifeq ("$(origin O)", "command line") ...@@ -83,18 +83,13 @@ ifeq ("$(origin O)", "command line")
endif endif
ifeq ($(BUILD_SRC),) ifeq ($(BUILD_SRC),)
ifneq ($(BUILD_OUTPUT),) ifneq ($(OUTPUT),)
define build_output define build_output
$(if $(VERBOSE:1=),@)+$(MAKE) -C $(BUILD_OUTPUT) \ $(if $(VERBOSE:1=),@)+$(MAKE) -C $(OUTPUT) \
BUILD_SRC=$(CURDIR) -f $(CURDIR)/Makefile $1 BUILD_SRC=$(CURDIR)/ -f $(CURDIR)/Makefile $1
endef endef
saved-output := $(BUILD_OUTPUT)
BUILD_OUTPUT := $(shell cd $(BUILD_OUTPUT) && /bin/pwd)
$(if $(BUILD_OUTPUT),, \
$(error output directory "$(saved-output)" does not exist))
all: sub-make all: sub-make
$(MAKECMDGOALS): sub-make $(MAKECMDGOALS): sub-make
...@@ -106,7 +101,7 @@ sub-make: force ...@@ -106,7 +101,7 @@ sub-make: force
# Leave processing to above invocation of make # Leave processing to above invocation of make
skip-makefile := 1 skip-makefile := 1
endif # BUILD_OUTPUT endif # OUTPUT
endif # BUILD_SRC endif # BUILD_SRC
# We process the rest of the Makefile if this is the final invocation of make # We process the rest of the Makefile if this is the final invocation of make
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册