aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2014-12-30 13:02:51 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-02-12 15:52:09 -0500
commitdb8486626246f86d8f6f77ff0020c68a6dda2e23 (patch)
treeee374e88d8a5dcf88509bfe56156fe9fbda088bf
parent8e499ac5376c03fa3ff90ddd7def3fee175aa4b6 (diff)
perf build: Remove PERF-CFLAGS file
Removing PERF-CFLAGS file, because the build framework stores full build command line for each object and triggers rebuilt if necessary. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Tested-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Tested-by: Will Deacon <will.deacon@arm.com> Cc: Alexis Berlemont <alexis.berlemont@gmail.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> 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-99hamnd2msiwgsi78yauihhd@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/Makefile.perf17
1 files changed, 3 insertions, 14 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index d49f7930d544..710731b4268e 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -365,7 +365,7 @@ LIBTRACEEVENT_FLAGS = $(QUIET_SUBDIR1) O=$(OUTPUT)
365LIBTRACEEVENT_FLAGS += CFLAGS="-g -Wall $(EXTRA_CFLAGS)" 365LIBTRACEEVENT_FLAGS += CFLAGS="-g -Wall $(EXTRA_CFLAGS)"
366LIBTRACEEVENT_FLAGS += plugin_dir=$(plugindir_SQ) 366LIBTRACEEVENT_FLAGS += plugin_dir=$(plugindir_SQ)
367 367
368$(LIBTRACEEVENT): $(TE_SOURCES) $(OUTPUT)PERF-CFLAGS 368$(LIBTRACEEVENT): $(TE_SOURCES)
369 $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) libtraceevent.a plugins 369 $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) libtraceevent.a plugins
370 370
371$(LIBTRACEEVENT)-clean: 371$(LIBTRACEEVENT)-clean:
@@ -444,17 +444,6 @@ cscope:
444 $(QUIET_GEN)$(RM) cscope*; \ 444 $(QUIET_GEN)$(RM) cscope*; \
445 $(FIND) $(TAG_FOLDERS) -name '*.[hcS]' -print | xargs cscope -b $(TAG_FILES) 445 $(FIND) $(TAG_FOLDERS) -name '*.[hcS]' -print | xargs cscope -b $(TAG_FILES)
446 446
447### Detect prefix changes
448TRACK_CFLAGS = $(subst ','\'',$(CFLAGS)):\
449 $(bindir_SQ):$(perfexecdir_SQ):$(template_dir_SQ):$(prefix_SQ):$(plugindir_SQ)
450
451$(OUTPUT)PERF-CFLAGS: .FORCE-PERF-CFLAGS
452 @FLAGS='$(TRACK_CFLAGS)'; \
453 if test x"$$FLAGS" != x"`cat $(OUTPUT)PERF-CFLAGS 2>/dev/null`" ; then \
454 echo 1>&2 " FLAGS: * new build flags or prefix"; \
455 echo "$$FLAGS" >$(OUTPUT)PERF-CFLAGS; \
456 fi
457
458### Testing rules 447### Testing rules
459 448
460# GNU make supports exporting all variables by "export" without parameters. 449# GNU make supports exporting all variables by "export" without parameters.
@@ -544,7 +533,7 @@ clean: $(LIBTRACEEVENT)-clean $(LIBAPIKFS)-clean config-clean
544 @find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete 533 @find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
545 @$(RM) .config-detected 534 @$(RM) .config-detected
546 $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32 535 $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32
547 $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)PERF-CFLAGS $(OUTPUT)PERF-FEATURES $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* 536 $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)PERF-FEATURES $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex*
548 $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean 537 $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
549 $(python-clean) 538 $(python-clean)
550 539
@@ -562,5 +551,5 @@ FORCE:
562 551
563.PHONY: all install clean config-clean strip install-gtk 552.PHONY: all install clean config-clean strip install-gtk
564.PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell 553.PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
565.PHONY: $(GIT-HEAD-PHONY) TAGS tags cscope .FORCE-PERF-CFLAGS FORCE single_dep 554.PHONY: $(GIT-HEAD-PHONY) TAGS tags cscope FORCE single_dep
566 555