diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-11-29 16:34:21 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-12-09 08:46:07 -0300 |
| commit | 3b761f9bda66c24c2686ae795e263cb49f6d8ef4 (patch) | |
| tree | 3d12a55016f362f325b2caeeecbe423dd42cb4df /tools | |
| parent | f4c8bae1920c459b7b9c12363d11e8a588862e42 (diff) | |
| download | linux-3b761f9bda66c24c2686ae795e263cb49f6d8ef4.tar.bz2 | |
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>
Diffstat (limited to 'tools')
| -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 # '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(DESTDIR)$(htmldir) ifneq ($(MAKECMDGOALS),clean) +ifneq ($(MAKECMDGOALS),tags) $(OUTPUT)PERF-VERSION-FILE: .FORCE-PERF-VERSION-FILE $(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) $(OUTPUT)PERF-VERSION-FILE -include $(OUTPUT)PERF-VERSION-FILE endif +endif # # 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 SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ ifneq ($(MAKECMDGOALS),clean) +ifneq ($(MAKECMDGOALS),tags) -include config/feature-tests.mak 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) EXTLIBS := $(filter-out -lpthread,$(EXTLIBS)) BASIC_CFLAGS += -I. endif +endif # MAKECMDGOALS != tags endif # MAKECMDGOALS != clean # Guard against environment variables @@ -525,6 +527,7 @@ PERFLIBS = $(LIB_FILE) $(LIBTRACEEVENT) # Platform specific tweaks # ifneq ($(MAKECMDGOALS),clean) +ifneq ($(MAKECMDGOALS),tags) # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If @@ -841,6 +844,7 @@ ifdef ASCIIDOC8 export ASCIIDOC8 endif +endif # MAKECMDGOALS != tags endif # MAKECMDGOALS != clean # Shell quote (do not use $(call) to accommodate ancient setups); |