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

Commit 8ec19c0e authored by Ingo Molnar's avatar Ingo Molnar Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Implement summary output for 'make clean' 



'make clean' used to show all the rm lines, which isn't really
informative in any way and spams the console.

Implement summary output:

  comet:~/tip/tools/perf> make clean
   CLEAN libtraceevent
   CLEAN liblk
   CLEAN config
   CLEAN core-objs
   CLEAN core-progs
   CLEAN core-gen
   CLEAN Documentation
   CLEAN python

'make clean V=1' will still show the old, detailed output.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1381312169-17354-2-git-send-email-mingo@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent cee972c0

tools/perf/Documentation/Makefile

+10 −8
Original line number Diff line number Diff line
@@ -246,15 +246,17 @@ $(OUTPUT)cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT) 
	$(PERL_PATH) ./cmd-list.perl ../command-list.txt $(QUIET_STDERR) && \

	date >$@



CLEAN_FILES =									\

	$(MAN_XML) $(addsuffix +,$(MAN_XML))					\

	$(MAN_HTML) $(addsuffix +,$(MAN_HTML))					\

	$(DOC_HTML) $(DOC_MAN1) $(DOC_MAN5) $(DOC_MAN7)				\

	$(OUTPUT)*.texi $(OUTPUT)*.texi+ $(OUTPUT)*.texi++			\

	$(OUTPUT)perf.info $(OUTPUT)perfman.info				\

	$(OUTPUT)howto-index.txt $(OUTPUT)howto/*.html $(OUTPUT)doc.dep		\

	$(OUTPUT)technical/api-*.html $(OUTPUT)technical/api-index.txt		\

	$(cmds_txt) $(OUTPUT)*.made

clean:

	$(RM) $(MAN_XML) $(addsuffix +,$(MAN_XML))

	$(RM) $(MAN_HTML) $(addsuffix +,$(MAN_HTML))

	$(RM) $(DOC_HTML) $(DOC_MAN1) $(DOC_MAN5) $(DOC_MAN7)

	$(RM) $(OUTPUT)*.texi $(OUTPUT)*.texi+ $(OUTPUT)*.texi++

	$(RM) $(OUTPUT)perf.info $(OUTPUT)perfman.info

	$(RM) $(OUTPUT)howto-index.txt $(OUTPUT)howto/*.html $(OUTPUT)doc.dep

	$(RM) $(OUTPUT)technical/api-*.html $(OUTPUT)technical/api-index.txt

	$(RM) $(cmds_txt) $(OUTPUT)*.made

	$(call QUIET_CLEAN, Documentation) $(RM) $(CLEAN_FILES)



$(MAN_HTML): $(OUTPUT)%.html : %.txt

	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \

tools/perf/Makefile.perf

+12 −12
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ PYTHON_EXTBUILD_LIB := $(PYTHON_EXTBUILD)lib/ 
PYTHON_EXTBUILD_TMP := $(PYTHON_EXTBUILD)tmp/

export PYTHON_EXTBUILD_LIB PYTHON_EXTBUILD_TMP



python-clean := rm -rf $(PYTHON_EXTBUILD) $(OUTPUT)python/perf.so

python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) $(OUTPUT)python/perf.so



PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources)

PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py $(LIBTRACEEVENT) $(LIBLK)
@@ -708,7 +708,8 @@ $(LIBTRACEEVENT): $(TE_SOURCES) 
	$(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) libtraceevent.a



$(LIBTRACEEVENT)-clean:

	$(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) clean

	$(call QUIET_CLEAN, libtraceevent)

	@$(MAKE) -C $(TRACE_EVENT_DIR) O=$(OUTPUT) clean >/dev/null



LIBLK_SOURCES = $(wildcard $(LK_PATH)*.[ch])
@@ -721,7 +722,8 @@ endif 


$(LIBLK)-clean:

ifeq ($(subdir),)

	$(QUIET_SUBDIR0)$(LK_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) clean

	$(call QUIET_CLEAN, liblk)

	@$(MAKE) -C $(LK_DIR) O=$(OUTPUT) clean >/dev/null

endif



help:
@@ -850,17 +852,15 @@ $(INSTALL_DOC_TARGETS): 
# not get included for the clean target:

#

config-clean:

	@$(MAKE) -C config/feature-checks clean

	$(call QUIET_CLEAN, config)

	@$(MAKE) -C config/feature-checks clean >/dev/null



clean: $(LIBTRACEEVENT)-clean $(LIBLK)-clean config-clean

	$(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(GTK_OBJS)

	$(RM) $(OUTPUT)perf-archive $(OUTPUT)perf.o $(LANG_BINDINGS)

	$(RM) $(ALL_PROGRAMS) perf

	$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope*

	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean

	$(RM) $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)PERF-CFLAGS

	$(RM) $(OUTPUT)util/*-bison*

	$(RM) $(OUTPUT)util/*-flex*

	$(call QUIET_CLEAN, core-objs)  $(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf.o $(LANG_BINDINGS) $(GTK_OBJS)

	$(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf

	$(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)util/*-bison* $(OUTPUT)util/*-flex*

	$(call QUIET_CLEAN, Documentation)

	@$(MAKE) -C Documentation O=$(OUTPUT) clean >/dev/null

	$(python-clean)



#

tools/perf/config/utilities.mak

+6 −0
Original line number Diff line number Diff line
@@ -178,3 +178,9 @@ endef 
_ge_attempt = $(if $(get-executable),$(get-executable),$(_gea_warn)$(call _gea_err,$(2)))

_gea_warn = $(warning The path '$(1)' is not executable.)

_gea_err  = $(if $(1),$(error Please set '$(1)' appropriately))



ifneq ($(findstring $(MAKEFLAGS),s),s)

  ifneq ($(V),1)

    QUIET_CLEAN      = @printf '  CLEAN %s\n' $(1);

  endif

endif

tools/scripts/Makefile.include

+1 −1

File changed.

Contains only whitespace changes.