提交 4842576c 编写于 作者: J Jiri Olsa 提交者: Arnaldo Carvalho de Melo

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: NJiri 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.orgSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
上级 ff3e33b0
......@@ -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:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册