diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-11-29 14:34:21 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-12-09 06:46:07 -0500 |
commit | 3b761f9bda66c24c2686ae795e263cb49f6d8ef4 (patch) | |
tree | 3d12a55016f362f325b2caeeecbe423dd42cb4df | |
parent | f4c8bae1920c459b7b9c12363d11e8a588862e42 (diff) |
perf tools: Don't check configuration on make tags
Doing the same thing done in:
b059dee: perf tools: Don't check configuration on make clean
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-n2ni4riphpqxw7d6ziv1ndyc@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r-- | tools/perf/Documentation/Makefile | 2 | ||||
-rw-r--r-- | tools/perf/Makefile | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile index f6e5901c8f5f..eb30044a922a 100644 --- a/tools/perf/Documentation/Makefile +++ b/tools/perf/Documentation/Makefile | |||
@@ -223,11 +223,13 @@ install-pdf: pdf | |||
223 | # '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(DESTDIR)$(htmldir) | 223 | # '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(DESTDIR)$(htmldir) |
224 | 224 | ||
225 | ifneq ($(MAKECMDGOALS),clean) | 225 | ifneq ($(MAKECMDGOALS),clean) |
226 | ifneq ($(MAKECMDGOALS),tags) | ||
226 | $(OUTPUT)PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE | 227 | $(OUTPUT)PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE |
227 | $(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) $(OUTPUT)PERF-VERSION-FILE | 228 | $(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) $(OUTPUT)PERF-VERSION-FILE |
228 | 229 | ||
229 | -include $(OUTPUT)PERF-VERSION-FILE | 230 | -include $(OUTPUT)PERF-VERSION-FILE |
230 | endif | 231 | endif |
232 | endif | ||
231 | 233 | ||
232 | # | 234 | # |
233 | # Determine "include::" file references in asciidoc files. | 235 | # Determine "include::" file references in asciidoc files. |
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 08da9fc616c4..2a07b957eac9 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
@@ -154,6 +154,7 @@ INSTALL = install | |||
154 | SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ | 154 | SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ |
155 | 155 | ||
156 | ifneq ($(MAKECMDGOALS),clean) | 156 | ifneq ($(MAKECMDGOALS),clean) |
157 | ifneq ($(MAKECMDGOALS),tags) | ||
157 | -include config/feature-tests.mak | 158 | -include config/feature-tests.mak |
158 | 159 | ||
159 | ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -fstack-protector-all,-fstack-protector-all),y) | 160 | ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -fstack-protector-all,-fstack-protector-all),y) |
@@ -207,6 +208,7 @@ ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS),bionic),y) | |||
207 | EXTLIBS := $(filter-out -lpthread,$(EXTLIBS)) | 208 | EXTLIBS := $(filter-out -lpthread,$(EXTLIBS)) |
208 | BASIC_CFLAGS += -I. | 209 | BASIC_CFLAGS += -I. |
209 | endif | 210 | endif |
211 | endif # MAKECMDGOALS != tags | ||
210 | endif # MAKECMDGOALS != clean | 212 | endif # MAKECMDGOALS != clean |
211 | 213 | ||
212 | # Guard against environment variables | 214 | # Guard against environment variables |
@@ -525,6 +527,7 @@ PERFLIBS = $(LIB_FILE) $(LIBTRACEEVENT) | |||
525 | # Platform specific tweaks | 527 | # Platform specific tweaks |
526 | # | 528 | # |
527 | ifneq ($(MAKECMDGOALS),clean) | 529 | ifneq ($(MAKECMDGOALS),clean) |
530 | ifneq ($(MAKECMDGOALS),tags) | ||
528 | 531 | ||
529 | # We choose to avoid "if .. else if .. else .. endif endif" | 532 | # We choose to avoid "if .. else if .. else .. endif endif" |
530 | # because maintaining the nesting to match is a pain. If | 533 | # because maintaining the nesting to match is a pain. If |
@@ -841,6 +844,7 @@ ifdef ASCIIDOC8 | |||
841 | export ASCIIDOC8 | 844 | export ASCIIDOC8 |
842 | endif | 845 | endif |
843 | 846 | ||
847 | endif # MAKECMDGOALS != tags | ||
844 | endif # MAKECMDGOALS != clean | 848 | endif # MAKECMDGOALS != clean |
845 | 849 | ||
846 | # Shell quote (do not use $(call) to accommodate ancient setups); | 850 | # Shell quote (do not use $(call) to accommodate ancient setups); |