From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932078AbcCXHhc (ORCPT ); Thu, 24 Mar 2016 03:37:32 -0400 Received: from terminus.zytor.com ([198.137.202.10]:42956 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756195AbcCXHhY (ORCPT ); Thu, 24 Mar 2016 03:37:24 -0400 Date: Thu, 24 Mar 2016 00:36:59 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: jpoimboe@redhat.com, hpa@zytor.com, tglx@linutronix.de, acme@redhat.com, adrian.hunter@intel.com, wangnan0@huawei.com, jolsa@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, namhyung@kernel.org Reply-To: jolsa@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org, namhyung@kernel.org, jpoimboe@redhat.com, tglx@linutronix.de, adrian.hunter@intel.com, hpa@zytor.com, acme@redhat.com, wangnan0@huawei.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] tools: Move utilities.mak from perf to tools/scripts/ Git-Commit-ID: ca70c24fb17b161a6096c584238cf81f664db45d 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: ca70c24fb17b161a6096c584238cf81f664db45d Gitweb: http://git.kernel.org/tip/ca70c24fb17b161a6096c584238cf81f664db45d Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 18 Mar 2016 13:57:20 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 18 Mar 2016 13:57:20 -0300 tools: Move utilities.mak from perf to tools/scripts/ As it is used by several other tools, better move it outside tools/perf. Cc: Adrian Hunter Cc: Jiri Olsa Cc: Josh Poimboeuf Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-34s9kue3xq9w5mijdmfrfx8s@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/api/Makefile | 2 +- tools/lib/subcmd/Makefile | 2 +- tools/perf/Documentation/Makefile | 2 +- tools/perf/Makefile.perf | 2 +- tools/perf/config/Makefile | 2 +- tools/{perf/config => scripts}/utilities.mak | 0 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile index bbc82c6..316f308 100644 --- a/tools/lib/api/Makefile +++ b/tools/lib/api/Makefile @@ -1,5 +1,5 @@ include ../../scripts/Makefile.include -include ../../perf/config/utilities.mak # QUIET_CLEAN +include ../../scripts/utilities.mak # QUIET_CLEAN ifeq ($(srctree),) srctree := $(patsubst %/,%,$(dir $(shell pwd))) diff --git a/tools/lib/subcmd/Makefile b/tools/lib/subcmd/Makefile index 629cf8c..25b3f69 100644 --- a/tools/lib/subcmd/Makefile +++ b/tools/lib/subcmd/Makefile @@ -1,5 +1,5 @@ include ../../scripts/Makefile.include -include ../../perf/config/utilities.mak # QUIET_CLEAN +include ../../scripts/utilities.mak # QUIET_CLEAN ifeq ($(srctree),) srctree := $(patsubst %/,%,$(dir $(shell pwd))) diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile index 3ba1c0b..098cfb9 100644 --- a/tools/perf/Documentation/Makefile +++ b/tools/perf/Documentation/Makefile @@ -1,5 +1,5 @@ include ../../scripts/Makefile.include -include ../config/utilities.mak +include ../../scripts/utilities.mak MAN1_TXT= \ $(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \ diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 4a4fad4..000ea21 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -3,7 +3,7 @@ include ../scripts/Makefile.include # The default target of this Makefile is... all: -include config/utilities.mak +include ../scripts/utilities.mak # Define V to have a more verbose compile. # diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index eca6a91..f7d7f5a 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -109,7 +109,7 @@ ifdef PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET CFLAGS += -DHAVE_ARCH_REGS_QUERY_REGISTER_OFFSET endif -include $(src-perf)/config/utilities.mak +include $(srctree)/tools/scripts/utilities.mak ifeq ($(call get-executable,$(FLEX)),) dummy := $(error Error: $(FLEX) is missing on this system, please install it) diff --git a/tools/perf/config/utilities.mak b/tools/scripts/utilities.mak similarity index 100% rename from tools/perf/config/utilities.mak rename to tools/scripts/utilities.mak