From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, paulus@samba.org,
hpa@zytor.com, mingo@kernel.org, a.p.zijlstra@chello.nl,
namhyung@kernel.org, jolsa@redhat.com, fweisbec@gmail.com,
rostedt@goodmis.org, dsahern@gmail.com, tglx@linutronix.de,
cjashfor@linux.vnet.ibm.com
Subject: [tip:perf/core] tools lib traceevent: Use global 'O' processing code
Date: Sun, 12 Jan 2014 10:35:04 -0800 [thread overview]
Message-ID: <tip-4c7aafc950178cd78f8cbda916ee8208afe039b5@git.kernel.org> (raw)
In-Reply-To: <1387460527-15030-10-git-send-email-jolsa@redhat.com>
Commit-ID: 4c7aafc950178cd78f8cbda916ee8208afe039b5
Gitweb: http://git.kernel.org/tip/4c7aafc950178cd78f8cbda916ee8208afe039b5
Author: Jiri Olsa <jolsa@redhat.com>
AuthorDate: Thu, 19 Dec 2013 14:42:07 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 19 Dec 2013 16:18:12 -0300
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: Jiri 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.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/lib/traceevent/Makefile | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 3496c9c..ca4ab78 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -83,18 +83,13 @@ ifeq ("$(origin O)", "command line")
endif
ifeq ($(BUILD_SRC),)
-ifneq ($(BUILD_OUTPUT),)
+ifneq ($(OUTPUT),)
define build_output
- $(if $(VERBOSE:1=),@)+$(MAKE) -C $(BUILD_OUTPUT) \
- BUILD_SRC=$(CURDIR) -f $(CURDIR)/Makefile $1
+ $(if $(VERBOSE:1=),@)+$(MAKE) -C $(OUTPUT) \
+ BUILD_SRC=$(CURDIR)/ -f $(CURDIR)/Makefile $1
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
$(MAKECMDGOALS): sub-make
@@ -106,7 +101,7 @@ sub-make: force
# Leave processing to above invocation of make
skip-makefile := 1
-endif # BUILD_OUTPUT
+endif # OUTPUT
endif # BUILD_SRC
# We process the rest of the Makefile if this is the final invocation of make
next prev parent reply other threads:[~2014-01-12 18:35 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-19 13:41 [PATCH 0/9] tools: Factor traceevent/perf Makefile Jiri Olsa
2013-12-19 13:41 ` [PATCH 1/9] perf tests: Factor make install tests Jiri Olsa
2014-01-12 18:33 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-19 13:42 ` [PATCH 2/9] perf tools: Making QUIET_(CLEAN|INSTAL) variables global Jiri Olsa
2014-01-12 18:33 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-19 13:42 ` [PATCH 3/9] tools lib traceevent: Remove print_app_build variable Jiri Olsa
2014-01-12 18:34 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-19 13:42 ` [PATCH 4/9] tools lib traceevent: Use global QUIET_CC build output Jiri Olsa
2014-01-12 18:34 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-19 13:42 ` [PATCH 5/9] tools lib traceevent: Add global QUIET_CC_FPIC " Jiri Olsa
2014-01-12 18:34 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-19 13:42 ` [PATCH 6/9] tools lib traceevent: Use global QUIET_LINK " Jiri Olsa
2014-01-12 18:34 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-19 13:42 ` [PATCH 7/9] tools lib traceevent: Use global QUIET_INSTALL " Jiri Olsa
2014-01-12 18:34 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-19 13:42 ` [PATCH 8/9] tools lib traceevent: Use global QUIET_CLEAN " Jiri Olsa
2014-01-12 18:34 ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-19 13:42 ` [PATCH 9/9] tools lib traceevent: Use global 'O' processing code Jiri Olsa
2014-01-12 18:35 ` tip-bot for Jiri Olsa [this message]
2013-12-20 17:33 ` [PATCH 0/9] tools: Factor traceevent/perf Makefile Jiri Olsa
2013-12-26 13:38 ` Arnaldo Carvalho de Melo
2013-12-26 20:10 ` Jiri Olsa
2013-12-26 20:52 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-4c7aafc950178cd78f8cbda916ee8208afe039b5@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox