Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934416AbbLQK4G (ORCPT ); Thu, 17 Dec 2015 05:56:06 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:59455 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756139AbbLQK4D (ORCPT ); Thu, 17 Dec 2015 05:56:03 -0500 From: Wang Nan To: , , , , , , , , , , , , CC: , Subject: [PATCH v6 02/16] tools: Move Makefile.arch from perf/config to tools/scripts Date: Thu, 17 Dec 2015 10:55:10 +0000 Message-ID: <1450349724-178569-3-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1450349724-178569-1-git-send-email-wangnan0@huawei.com> References: <1450349724-178569-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020205.567294B1.000B,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 8771ebfc1439772385f0dde494a5ae5a Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2024 Lines: 56 After this patch other directories can use this architecture detector without directly including it from perf's directory. Libbpf would utilize it to get proper $(ARCH) so it can receive correct uapi include directory. Signed-off-by: Wang Nan Acked-by: Jiri Olsa Tested-by: Naveen N. Rao Cc: Arnaldo Carvalho de Melo Cc: Naveen N. Rao Cc: Sukadev Bhattiprolu --- tools/perf/config/Makefile | 2 +- tools/perf/tests/make | 2 +- tools/{perf/config => scripts}/Makefile.arch | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename tools/{perf/config => scripts}/Makefile.arch (100%) diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index a552417..34717e4 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -17,7 +17,7 @@ detected_var = $(shell echo "$(1)=$($(1))" >> $(OUTPUT).config-detected) CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS) -include $(src-perf)/config/Makefile.arch +include $(srctree)/tools/scripts/Makefile.arch $(call detected_var,ARCH) diff --git a/tools/perf/tests/make b/tools/perf/tests/make index c1fbb8e..a8ede37 100644 --- a/tools/perf/tests/make +++ b/tools/perf/tests/make @@ -12,7 +12,7 @@ endif else PERF := . -include config/Makefile.arch +include $(srctree)/scripts/Makefile.arch # FIXME looks like x86 is the only arch running tests ;-) # we need some IS_(32/64) flag to make this generic diff --git a/tools/perf/config/Makefile.arch b/tools/scripts/Makefile.arch similarity index 100% rename from tools/perf/config/Makefile.arch rename to tools/scripts/Makefile.arch -- 1.8.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/