From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757585AbcHDJOs (ORCPT ); Thu, 4 Aug 2016 05:14:48 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51560 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754047AbcHDJOm (ORCPT ); Thu, 4 Aug 2016 05:14:42 -0400 Date: Thu, 4 Aug 2016 02:13:06 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: hpa@zytor.com, acme@redhat.com, namhyung@kernel.org, jolsa@kernel.org, a.p.zijlstra@chello.nl, dsahern@gmail.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: hpa@zytor.com, acme@redhat.com, jolsa@kernel.org, namhyung@kernel.org, dsahern@gmail.com, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org In-Reply-To: <1470074555-24889-6-git-send-email-jolsa@kernel.org> References: <1470074555-24889-6-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Move config/Makefile into Makefile.config Git-Commit-ID: 4842576cd857887ddfed58f452af38b9457639d7 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: 4842576cd857887ddfed58f452af38b9457639d7 Gitweb: http://git.kernel.org/tip/4842576cd857887ddfed58f452af38b9457639d7 Author: Jiri Olsa AuthorDate: Mon, 1 Aug 2016 20:02:33 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 2 Aug 2016 16:33:28 -0300 perf tools: Move config/Makefile into Makefile.config There's no reason to keep it in separate directory now when we moved out the rest of the files. Signed-off-by: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1470074555-24889-6-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/{config/Makefile => Makefile.config} | 0 tools/perf/Makefile.perf | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/config/Makefile b/tools/perf/Makefile.config similarity index 100% rename from tools/perf/config/Makefile rename to tools/perf/Makefile.config diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 6641abb..2d90875 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -161,7 +161,7 @@ TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/ BPF_DIR = $(srctree)/tools/lib/bpf/ SUBCMD_DIR = $(srctree)/tools/lib/subcmd/ -# include config/Makefile by default and rule out +# include Makefile.config by default and rule out # non-config cases config := 1 @@ -183,7 +183,7 @@ ifeq ($(filter feature-dump,$(MAKECMDGOALS)),feature-dump) FEATURE_TESTS := all endif endif -include config/Makefile +include Makefile.config endif ifeq ($(config),0) @@ -706,7 +706,7 @@ $(INSTALL_DOC_TARGETS): ### Cleaning rules # -# This is here, not in config/Makefile, because config/Makefile does +# This is here, not in Makefile.config, because Makefile.config does # not get included for the clean target: # config-clean: