[PATCH 05/14] perf build: Rename display_lib into feature_display

Jiri Olsa
2015-03-03T14:31:13Z

Preparing for feature checks separation, moving related
stuff under 'feature*' namespace.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <david.ahern@oracle.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
---
tools/perf/config/Makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 09135b763e6d..03d420570d6c 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -794,7 +794,7 @@ ifeq ($(dwarf-post-unwind),1)
PERF_FEATURES += dwarf-post-unwind($(dwarf-post-unwind-text))
endif

-# The $(display_lib) controls the default detection message
+# The $(feature_display) controls the default detection message
# output. It's set if:
# - detected features differes from stored features from
# last build (in PERF-FEATURES file)
@@ -803,24 +803,24 @@ endif

ifneq ("$(PERF_FEATURES)","$(PERF_FEATURES_FILE)")
$(shell echo "$(PERF_FEATURES)" > $(OUTPUT)PERF-FEATURES)
- display_lib := 1
+ feature_display := 1
endif

feature_check = $(eval $(feature_check_code))
define feature_check_code
ifneq ($(feature-$(1)), 1)
- display_lib := 1
+ feature_display := 1
endif
endef

$(foreach feat,$(FEATURE_DISPLAY),$(call feature_check,$(feat)))

ifeq ($(VF),1)
- display_lib := 1
+ feature_display := 1
display_vf := 1
endif

-ifeq ($(display_lib),1)
+ifeq ($(feature_display),1)
$(info )
$(info Auto-detecting system features:)
$(foreach feat,$(FEATURE_DISPLAY),$(call feature_print_status,$(feat),))
@@ -842,7 +842,7 @@ ifeq ($(display_vf),1)
$(call feature_print_var,LIBDW_DIR)
endif

-ifeq ($(display_lib),1)
+ifeq ($(feature_display),1)
$(info )
endif

--
1.9.3