aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-10-09 05:49:29 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-10-11 11:18:11 -0400
commit8a5411e9a3e65ab70b094022e5aa6deaec82ae7c (patch)
tree03ae94f397bcf0b648aee474bd9040100b980152
parent3fae82db558468c01f36eb6398e9459ac240e697 (diff)
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>
-rw-r--r--tools/perf/Documentation/Makefile27
-rw-r--r--tools/perf/Makefile.perf54
-rw-r--r--tools/perf/config/utilities.mak3
3 files changed, 48 insertions, 36 deletions
diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile
index c4c300cf155f..3ba1c0b09908 100644
--- a/tools/perf/Documentation/Makefile
+++ b/tools/perf/Documentation/Makefile
@@ -184,12 +184,13 @@ ifdef missing_tools
184endif 184endif
185 185
186do-install-man: man 186do-install-man: man
187 $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir) 187 $(call QUIET_INSTALL, Documentation-man) \
188# $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir) 188 $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir); \
189# $(INSTALL) -d -m 755 $(DESTDIR)$(man7dir) 189# $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir); \
190 $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir) 190# $(INSTALL) -d -m 755 $(DESTDIR)$(man7dir); \
191# $(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir) 191 $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir); \
192# $(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir) 192# $(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir); \
193# $(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir)
193 194
194install-man: check-man-tools man 195install-man: check-man-tools man
195 196
@@ -202,18 +203,20 @@ endif
202try-install-man: $(DO_INSTALL_MAN) 203try-install-man: $(DO_INSTALL_MAN)
203 204
204install-info: info 205install-info: info
205 $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) 206 $(call QUIET_INSTALL, Documentation-info) \
206 $(INSTALL) -m 644 $(OUTPUT)perf.info $(OUTPUT)perfman.info $(DESTDIR)$(infodir) 207 $(INSTALL) -d -m 755 $(DESTDIR)$(infodir); \
208 $(INSTALL) -m 644 $(OUTPUT)perf.info $(OUTPUT)perfman.info $(DESTDIR)$(infodir); \
207 if test -r $(DESTDIR)$(infodir)/dir; then \ 209 if test -r $(DESTDIR)$(infodir)/dir; then \
208 $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) perf.info ;\ 210 $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) perf.info ;\
209 $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) perfman.info ;\ 211 $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) perfman.info ;\
210 else \ 212 else \
211 echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \ 213 echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \
212 fi 214 fi
213 215
214install-pdf: pdf 216install-pdf: pdf
215 $(INSTALL) -d -m 755 $(DESTDIR)$(pdfdir) 217 $(call QUIET_INSTALL, Documentation-pdf) \
216 $(INSTALL) -m 644 $(OUTPUT)user-manual.pdf $(DESTDIR)$(pdfdir) 218 $(INSTALL) -d -m 755 $(DESTDIR)$(pdfdir); \
219 $(INSTALL) -m 644 $(OUTPUT)user-manual.pdf $(DESTDIR)$(pdfdir)
217 220
218#install-html: html 221#install-html: html
219# '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(DESTDIR)$(htmldir) 222# '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(DESTDIR)$(htmldir)
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index f91bd5a9b50a..c873e039aafb 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -504,8 +504,9 @@ ifndef NO_GTK2
504 GTK_OBJS += $(OUTPUT)ui/gtk/annotate.o 504 GTK_OBJS += $(OUTPUT)ui/gtk/annotate.o
505 505
506install-gtk: $(OUTPUT)libperf-gtk.so 506install-gtk: $(OUTPUT)libperf-gtk.so
507 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(libdir_SQ)' 507 $(call QUIET_INSTALL, 'GTK UI') \
508 $(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)' 508 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(libdir_SQ)'; \
509 $(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)'
509endif 510endif
510 511
511ifndef NO_LIBPERL 512ifndef NO_LIBPERL
@@ -810,31 +811,38 @@ check: $(OUTPUT)common-cmds.h
810install-gtk: 811install-gtk:
811 812
812install-bin: all install-gtk 813install-bin: all install-gtk
813 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' 814 $(call QUIET_INSTALL, binaries) \
814 $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)' 815 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'; \
815 $(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(bindir_SQ)/trace' 816 $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'; \
816 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' 817 $(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(bindir_SQ)/trace'
817 $(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' 818 $(call QUIET_INSTALL, libexec) \
819 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
820 $(call QUIET_INSTALL, perf-archive) \
821 $(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
818ifndef NO_LIBPERL 822ifndef NO_LIBPERL
819 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace' 823 $(call QUIET_INSTALL, perl-scripts) \
820 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin' 824 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'; \
821 $(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/Perf-Trace-Util/lib/Perf/Trace/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'; \
822 $(INSTALL) scripts/perl/*.pl -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl' 826 $(INSTALL) scripts/perl/*.pl -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl'; \
823 $(INSTALL) scripts/perl/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin' 827 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'; \
828 $(INSTALL) scripts/perl/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'
824endif 829endif
825ifndef NO_LIBPYTHON 830ifndef NO_LIBPYTHON
826 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/Perf-Trace-Util/lib/Perf/Trace' 831 $(call QUIET_INSTALL, python-scripts) \
827 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin' 832 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/Perf-Trace-Util/lib/Perf/Trace'; \
828 $(INSTALL) scripts/python/Perf-Trace-Util/lib/Perf/Trace/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/Perf-Trace-Util/lib/Perf/Trace' 833 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'; \
829 $(INSTALL) scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python' 834 $(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/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin' 835 $(INSTALL) scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python'; \
836 $(INSTALL) scripts/python/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'
831endif 837endif
832 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d' 838 $(call QUIET_INSTALL, bash_completion-script) \
833 $(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf' 839 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'; \
834 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests' 840 $(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf'
835 $(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests' 841 $(call QUIET_INSTALL, tests) \
836 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr' 842 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \
837 $(INSTALL) tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr' 843 $(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \
844 $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \
845 $(INSTALL) tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'
838 846
839install: install-bin try-install-man 847install: install-bin try-install-man
840 848
diff --git a/tools/perf/config/utilities.mak b/tools/perf/config/utilities.mak
index 94908a5fbea7..f168debc5be2 100644
--- a/tools/perf/config/utilities.mak
+++ b/tools/perf/config/utilities.mak
@@ -181,6 +181,7 @@ _gea_err = $(if $(1),$(error Please set '$(1)' appropriately))
181 181
182ifneq ($(findstring $(MAKEFLAGS),s),s) 182ifneq ($(findstring $(MAKEFLAGS),s),s)
183 ifneq ($(V),1) 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 endif 186 endif
186endif 187endif