From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933618AbbI2ImN (ORCPT ); Tue, 29 Sep 2015 04:42:13 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37660 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933343AbbI2IkY (ORCPT ); Tue, 29 Sep 2015 04:40:24 -0400 Date: Tue, 29 Sep 2015 01:40:06 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: namhyung@kernel.org, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, jolsa@kernel.org, acme@redhat.com, dsahern@gmail.com, tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com Reply-To: tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, jolsa@kernel.org, acme@redhat.com, dsahern@gmail.com In-Reply-To: <1443004442-32660-5-git-send-email-jolsa@kernel.org> References: <1443004442-32660-5-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools build: Move dependency copy into function Git-Commit-ID: 275e2d95591e2714d6b541d4e26959381d6b2705 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 275e2d95591e2714d6b541d4e26959381d6b2705 Gitweb: http://git.kernel.org/tip/275e2d95591e2714d6b541d4e26959381d6b2705 Author: Jiri Olsa AuthorDate: Wed, 23 Sep 2015 12:33:59 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 28 Sep 2015 15:50:55 -0300 tools build: Move dependency copy into function So it's easier to add more functionality in the following commit. Signed-off-by: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1443004442-32660-5-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/build/Build.include | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/build/Build.include b/tools/build/Build.include index 4c8daac..851c420 100644 --- a/tools/build/Build.include +++ b/tools/build/Build.include @@ -55,14 +55,19 @@ make-cmd = $(call escsq,$(subst \#,\\\#,$(subst $$,$$$$,$(cmd_$(1))))) any-prereq = $(filter-out $(PHONY),$?) $(filter-out $(PHONY) $(wildcard $^),$^) ### +# Copy dependency data into .cmd file +# - gcc -M dependency info +# - command line to create object 'cmd_object :=' +dep-cmd = cat $(depfile) > $(dot-target).cmd; \ + printf '%s\n' 'cmd_$@ := $(make-cmd)' >> $(dot-target).cmd + +### # if_changed_dep - execute command if any prerequisite is newer than # target, or command line has changed and update # dependencies in the cmd file if_changed_dep = $(if $(strip $(any-prereq) $(arg-check)), \ @set -e; \ - $(echo-cmd) $(cmd_$(1)); \ - cat $(depfile) > $(dot-target).cmd; \ - printf '%s\n' 'cmd_$@ := $(make-cmd)' >> $(dot-target).cmd) + $(echo-cmd) $(cmd_$(1)) && $(dep-cmd)) # if_changed - execute command if any prerequisite is newer than # target, or command line has changed