Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jiri Olsa and committed by
Arnaldo Carvalho de Melo
4842576c ff3e33b0

+3 -3
+3 -3
tools/perf/Makefile.perf
··· 161 161 BPF_DIR = $(srctree)/tools/lib/bpf/ 162 162 SUBCMD_DIR = $(srctree)/tools/lib/subcmd/ 163 163 164 - # include config/Makefile by default and rule out 164 + # include Makefile.config by default and rule out 165 165 # non-config cases 166 166 config := 1 167 167 ··· 183 183 FEATURE_TESTS := all 184 184 endif 185 185 endif 186 - include config/Makefile 186 + include Makefile.config 187 187 endif 188 188 189 189 ifeq ($(config),0) ··· 706 706 ### Cleaning rules 707 707 708 708 # 709 - # This is here, not in config/Makefile, because config/Makefile does 709 + # This is here, not in Makefile.config, because Makefile.config does 710 710 # not get included for the clean target: 711 711 # 712 712 config-clean:
tools/perf/config/Makefile tools/perf/Makefile.config