Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Ingo 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: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Ingo Molnar and committed by
Arnaldo Carvalho de Melo
8a5411e9 3fae82db

+48 -36
+15 -12
tools/perf/Documentation/Makefile
··· 184 184 endif 185 185 186 186 do-install-man: man 187 - $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir) 188 - # $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir) 189 - # $(INSTALL) -d -m 755 $(DESTDIR)$(man7dir) 190 - $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir) 191 - # $(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir) 192 - # $(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir) 187 + $(call QUIET_INSTALL, Documentation-man) \ 188 + $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir); \ 189 + # $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir); \ 190 + # $(INSTALL) -d -m 755 $(DESTDIR)$(man7dir); \ 191 + $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir); \ 192 + # $(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir); \ 193 + # $(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir) 193 194 194 195 install-man: check-man-tools man 195 196 ··· 203 202 try-install-man: $(DO_INSTALL_MAN) 204 203 205 204 install-info: info 206 - $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) 207 - $(INSTALL) -m 644 $(OUTPUT)perf.info $(OUTPUT)perfman.info $(DESTDIR)$(infodir) 205 + $(call QUIET_INSTALL, Documentation-info) \ 206 + $(INSTALL) -d -m 755 $(DESTDIR)$(infodir); \ 207 + $(INSTALL) -m 644 $(OUTPUT)perf.info $(OUTPUT)perfman.info $(DESTDIR)$(infodir); \ 208 208 if test -r $(DESTDIR)$(infodir)/dir; then \ 209 - $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) perf.info ;\ 210 - $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) perfman.info ;\ 209 + $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) perf.info ;\ 210 + $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) perfman.info ;\ 211 211 else \ 212 212 echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \ 213 213 fi 214 214 215 215 install-pdf: pdf 216 - $(INSTALL) -d -m 755 $(DESTDIR)$(pdfdir) 217 - $(INSTALL) -m 644 $(OUTPUT)user-manual.pdf $(DESTDIR)$(pdfdir) 216 + $(call QUIET_INSTALL, Documentation-pdf) \ 217 + $(INSTALL) -d -m 755 $(DESTDIR)$(pdfdir); \ 218 + $(INSTALL) -m 644 $(OUTPUT)user-manual.pdf $(DESTDIR)$(pdfdir) 218 219 219 220 #install-html: html 220 221 # '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(DESTDIR)$(htmldir)
+31 -23
tools/perf/Makefile.perf
··· 504 504 GTK_OBJS += $(OUTPUT)ui/gtk/annotate.o 505 505 506 506 install-gtk: $(OUTPUT)libperf-gtk.so 507 - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(libdir_SQ)' 508 - $(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)' 507 + $(call QUIET_INSTALL, 'GTK UI') \ 508 + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(libdir_SQ)'; \ 509 + $(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)' 509 510 endif 510 511 511 512 ifndef NO_LIBPERL ··· 811 810 install-gtk: 812 811 813 812 install-bin: all install-gtk 814 - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' 815 - $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)' 816 - $(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(bindir_SQ)/trace' 817 - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' 818 - $(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' 813 + $(call QUIET_INSTALL, binaries) \ 814 + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'; \ 815 + $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'; \ 816 + $(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(bindir_SQ)/trace' 817 + $(call QUIET_INSTALL, libexec) \ 818 + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' 819 + $(call QUIET_INSTALL, perf-archive) \ 820 + $(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' 819 821 ifndef NO_LIBPERL 820 - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace' 821 - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin' 822 - $(INSTALL) scripts/perl/Perf-Trace-Util/lib/Perf/Trace/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace' 823 - $(INSTALL) scripts/perl/*.pl -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl' 824 - $(INSTALL) scripts/perl/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin' 822 + $(call QUIET_INSTALL, perl-scripts) \ 823 + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'; \ 824 + $(INSTALL) scripts/perl/Perf-Trace-Util/lib/Perf/Trace/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'; \ 825 + $(INSTALL) scripts/perl/*.pl -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl'; \ 826 + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'; \ 827 + $(INSTALL) scripts/perl/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin' 825 828 endif 826 829 ifndef NO_LIBPYTHON 827 - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/Perf-Trace-Util/lib/Perf/Trace' 828 - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin' 829 - $(INSTALL) scripts/python/Perf-Trace-Util/lib/Perf/Trace/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/Perf-Trace-Util/lib/Perf/Trace' 830 - $(INSTALL) scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python' 831 - $(INSTALL) scripts/python/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin' 830 + $(call QUIET_INSTALL, python-scripts) \ 831 + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/Perf-Trace-Util/lib/Perf/Trace'; \ 832 + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'; \ 833 + $(INSTALL) scripts/python/Perf-Trace-Util/lib/Perf/Trace/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/Perf-Trace-Util/lib/Perf/Trace'; \ 834 + $(INSTALL) scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python'; \ 835 + $(INSTALL) scripts/python/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin' 832 836 endif 833 - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d' 834 - $(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf' 835 - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests' 836 - $(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests' 837 - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr' 838 - $(INSTALL) tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr' 837 + $(call QUIET_INSTALL, bash_completion-script) \ 838 + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'; \ 839 + $(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf' 840 + $(call QUIET_INSTALL, tests) \ 841 + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ 842 + $(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ 843 + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \ 844 + $(INSTALL) tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr' 839 845 840 846 install: install-bin try-install-man 841 847
+2 -1
tools/perf/config/utilities.mak
··· 181 181 182 182 ifneq ($(findstring $(MAKEFLAGS),s),s) 183 183 ifneq ($(V),1) 184 - QUIET_CLEAN = @printf ' CLEAN %s\n' $(1); 184 + QUIET_CLEAN = @printf ' CLEAN %s\n' $1; 185 + QUIET_INSTALL = @printf ' INSTALL %s\n' $1; 185 186 endif 186 187 endif