summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2016-08-01 20:02:33 +0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-08-02 16:33:28 -0300
commit4842576cd857887ddfed58f452af38b9457639d7 (patch)
tree872e6002ae25ed7495efdb68fbbd7e3188ead012 /tools
parentff3e33b075fe45c669e2cb27489d570e29d3abeb (diff)
downloadlinux-stable-4842576cd857887ddfed58f452af38b9457639d7.tar.gz
linux-stable-4842576cd857887ddfed58f452af38b9457639d7.tar.bz2
linux-stable-4842576cd857887ddfed58f452af38b9457639d7.zip
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 <jolsa@kernel.org> Cc: David Ahern <dsahern@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1470074555-24889-6-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/Makefile.config (renamed from tools/perf/config/Makefile)0
-rw-r--r--tools/perf/Makefile.perf6
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/Makefile.config
index 24803c58049a..24803c58049a 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/Makefile.config
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 6641abb97f0a..2d9087501633 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: