Skip to content

Commit 4842576

Browse files
olsajiriacmel
authored andcommitted
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>
1 parent ff3e33b commit 4842576

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed
File renamed without changes.

tools/perf/Makefile.perf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/
161161
BPF_DIR = $(srctree)/tools/lib/bpf/
162162
SUBCMD_DIR = $(srctree)/tools/lib/subcmd/
163163

164-
# include config/Makefile by default and rule out
164+
# include Makefile.config by default and rule out
165165
# non-config cases
166166
config := 1
167167

@@ -183,7 +183,7 @@ ifeq ($(filter feature-dump,$(MAKECMDGOALS)),feature-dump)
183183
FEATURE_TESTS := all
184184
endif
185185
endif
186-
include config/Makefile
186+
include Makefile.config
187187
endif
188188

189189
ifeq ($(config),0)
@@ -706,7 +706,7 @@ $(INSTALL_DOC_TARGETS):
706706
### Cleaning rules
707707

708708
#
709-
# This is here, not in config/Makefile, because config/Makefile does
709+
# This is here, not in Makefile.config, because Makefile.config does
710710
# not get included for the clean target:
711711
#
712712
config-clean:

0 commit comments

Comments
 (0)