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

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

perf tools: Implement summary output for 'make install' 



'make install' used to show all the install lines, which is way too
verbose to be really informative to the user.

Implement summary output instead:

  comet:~/tip/tools/perf> make install
    BUILD:   Doing 'make -j12' parallel build
    SUBDIR   Documentation
    INSTALL  Documentation-man
    INSTALL  binaries
    INSTALL  libexec
    INSTALL  perf-archive
    INSTALL  perl-scripts
    INSTALL  python-scripts
    INSTALL  bash_completion-script
    INSTALL  tests

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

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>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: http://lkml.kernel.org/r/1381312169-17354-5-git-send-email-mingo@kernel.org


[ Fixed conflict with libperf-gtk patches in acme/perf/core, cope with 'trace' alias ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 3fae82db

tools/perf/Documentation/Makefile

+15 −12
Original line number Diff line number Diff line
@@ -184,11 +184,12 @@ ifdef missing_tools 
endif



do-install-man: man

	$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)

#	$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)

#	$(INSTALL) -d -m 755 $(DESTDIR)$(man7dir)

	$(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir)

#	$(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir)

	$(call QUIET_INSTALL, Documentation-man) \

		$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir); \

#		$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir); \

#		$(INSTALL) -d -m 755 $(DESTDIR)$(man7dir); \

		$(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir); \

#		$(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir); \

#		$(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir)



install-man: check-man-tools man
@@ -202,8 +203,9 @@ endif 
try-install-man: $(DO_INSTALL_MAN)



install-info: info

	$(INSTALL) -d -m 755 $(DESTDIR)$(infodir)

	$(INSTALL) -m 644 $(OUTPUT)perf.info $(OUTPUT)perfman.info $(DESTDIR)$(infodir)

	$(call QUIET_INSTALL, Documentation-info) \

		$(INSTALL) -d -m 755 $(DESTDIR)$(infodir); \

		$(INSTALL) -m 644 $(OUTPUT)perf.info $(OUTPUT)perfman.info $(DESTDIR)$(infodir); \

	if test -r $(DESTDIR)$(infodir)/dir; then \

		$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) perf.info ;\

		$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) perfman.info ;\
@@ -212,7 +214,8 @@ install-info: info 
	fi



install-pdf: pdf

	$(INSTALL) -d -m 755 $(DESTDIR)$(pdfdir)

	$(call QUIET_INSTALL, Documentation-pdf) \

		$(INSTALL) -d -m 755 $(DESTDIR)$(pdfdir); \

		$(INSTALL) -m 644 $(OUTPUT)user-manual.pdf $(DESTDIR)$(pdfdir)



#install-html: html

tools/perf/Makefile.perf

+31 −23
Original line number Diff line number Diff line
@@ -504,7 +504,8 @@ ifndef NO_GTK2 
  GTK_OBJS += $(OUTPUT)ui/gtk/annotate.o



install-gtk: $(OUTPUT)libperf-gtk.so

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(libdir_SQ)'

	$(call QUIET_INSTALL, 'GTK UI') \

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(libdir_SQ)'; \

		$(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)'

endif
@@ -810,30 +811,37 @@ check: $(OUTPUT)common-cmds.h 
install-gtk:



install-bin: all install-gtk

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'

	$(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'

	$(call QUIET_INSTALL, binaries) \

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'; \

		$(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'; \

		$(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(bindir_SQ)/trace'

	$(call QUIET_INSTALL, libexec) \

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'

	$(call QUIET_INSTALL, perf-archive) \

		$(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'

ifndef NO_LIBPERL

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'

	$(INSTALL) scripts/perl/Perf-Trace-Util/lib/Perf/Trace/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'

	$(INSTALL) scripts/perl/*.pl -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl'

	$(call QUIET_INSTALL, perl-scripts) \

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'; \

		$(INSTALL) scripts/perl/Perf-Trace-Util/lib/Perf/Trace/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'; \

		$(INSTALL) scripts/perl/*.pl -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl'; \

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'; \

		$(INSTALL) scripts/perl/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'

endif

ifndef NO_LIBPYTHON

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/Perf-Trace-Util/lib/Perf/Trace'

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'

	$(INSTALL) scripts/python/Perf-Trace-Util/lib/Perf/Trace/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/Perf-Trace-Util/lib/Perf/Trace'

	$(INSTALL) scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python'

	$(call QUIET_INSTALL, python-scripts) \

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/Perf-Trace-Util/lib/Perf/Trace'; \

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'; \

		$(INSTALL) scripts/python/Perf-Trace-Util/lib/Perf/Trace/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/Perf-Trace-Util/lib/Perf/Trace'; \

		$(INSTALL) scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python'; \

		$(INSTALL) scripts/python/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'

endif

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'

	$(call QUIET_INSTALL, bash_completion-script) \

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'; \

		$(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf'

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'

	$(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'

	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'

	$(call QUIET_INSTALL, tests) \

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \

		$(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \

		$(INSTALL) tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'



install: install-bin try-install-man

tools/perf/config/utilities.mak

+2 −1
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ _gea_err = $(if $(1),$(error Please set '$(1)' appropriately)) 


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

  ifneq ($(V),1)

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

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

    QUIET_INSTALL	= @printf '  INSTALL  %s\n' $1;

  endif

endif