Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4842576c authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarJiri 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ff3e33b0

tools/perf/config/Makefile→tools/perf/Makefile.config

+0 −0

File moved.

View file

tools/perf/Makefile.perf

+3 −3
Original line number Diff line number Diff line
@@ -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: