5 files changed, 32 insertions, 30 deletions

diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index ca6cb779876a..fc1502098595 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -134,14 +134,14 @@ ifeq ($(VERBOSE),1)
   print_install =
 else
   Q = @
-  print_compile =               echo '  CC                 '$(OBJ);
-  print_app_build =             echo '  BUILD              '$(OBJ);
-  print_fpic_compile =          echo '  CC FPIC            '$(OBJ);
-  print_shared_lib_compile =    echo '  BUILD SHARED LIB   '$(OBJ);
-  print_plugin_obj_compile =    echo '  CC PLUGIN OBJ      '$(OBJ);
-  print_plugin_build =          echo '  CC PLUGI           '$(OBJ);
-  print_static_lib_build =      echo '  BUILD STATIC LIB   '$(OBJ);
-  print_install =               echo '  INSTALL     '$1'        to      $(DESTDIR_SQ)$2';
+  print_compile =               echo '  CC       '$(OBJ);
+  print_app_build =             echo '  BUILD    '$(OBJ);
+  print_fpic_compile =          echo '  CC FPIC  '$(OBJ);
+  print_shared_lib_compile =    echo '  BUILD    SHARED LIB '$(OBJ);
+  print_plugin_obj_compile =    echo '  BUILD    PLUGIN OBJ '$(OBJ);
+  print_plugin_build =          echo '  BUILD    PLUGIN     '$(OBJ);
+  print_static_lib_build =      echo '  BUILD    STATIC LIB '$(OBJ);
+  print_install =               echo '  INSTALL  '$1'   to      $(DESTDIR_SQ)$2';
 endif
 
 do_fpic_compile =                                       \
@@ -268,7 +268,7 @@ TRACK_CFLAGS = $(subst ','\'',$(CFLAGS)):$(ARCH):$(CROSS_COMPILE)
 TRACEEVENT-CFLAGS: force
         @FLAGS='$(TRACK_CFLAGS)'; \
             if test x"$$FLAGS" != x"`cat TRACEEVENT-CFLAGS 2>/dev/null`" ; then \
-                echo 1>&2 "    * new build flags or cross compiler"; \
+                echo 1>&2 "  FLAGS:   * new build flags or cross compiler"; \
                 echo "$$FLAGS" >TRACEEVENT-CFLAGS; \
             fi
 
diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile
index be5adb1e0290..c4c300cf155f 100644
--- a/tools/perf/Documentation/Makefile
+++ b/tools/perf/Documentation/Makefile
@@ -145,16 +145,17 @@ endif
 
 ifneq ($(findstring $(MAKEFLAGS),s),s)
 ifneq ($(V),1)
-        QUIET_ASCIIDOC  = @echo '   ' ASCIIDOC $@;
-        QUIET_XMLTO     = @echo '   ' XMLTO $@;
-        QUIET_DB2TEXI   = @echo '   ' DB2TEXI $@;
-        QUIET_MAKEINFO  = @echo '   ' MAKEINFO $@;
-        QUIET_DBLATEX   = @echo '   ' DBLATEX $@;
-        QUIET_XSLTPROC  = @echo '   ' XSLTPROC $@;
-        QUIET_GEN       = @echo '   ' GEN $@;
+        QUIET_ASCIIDOC  = @echo '  ASCIIDOC '$@;
+        QUIET_XMLTO     = @echo '  XMLTO    '$@;
+        QUIET_DB2TEXI   = @echo '  DB2TEXI  '$@;
+        QUIET_MAKEINFO  = @echo '  MAKEINFO '$@;
+        QUIET_DBLATEX   = @echo '  DBLATEX  '$@;
+        QUIET_XSLTPROC  = @echo '  XSLTPROC '$@;
+        QUIET_GEN       = @echo '  GEN      '$@;
         QUIET_STDERR    = 2> /dev/null
         QUIET_SUBDIR0   = +@subdir=
-        QUIET_SUBDIR1   = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
+        QUIET_SUBDIR1   = ;$(NO_SUBDIR) \
+                           echo '  SUBDIR   ' $$subdir; \
                           $(MAKE) $(PRINT_DIR) -C $$subdir
         export V
 endif
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 9580ebe260e0..5aa3d040bbf3 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -38,7 +38,7 @@ ifneq ($(O),)
 endif
 
 define print_msg
-  @printf '    BUILD: Doing '\''make \033[33m-j'$(JOBS)'\033[m'\'' parallel build\n'
+  @printf '  BUILD:   Doing '\''make \033[33m-j'$(JOBS)'\033[m'\'' parallel build\n'
 endef
 
 define make
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 250b276c136f..f91bd5a9b50a 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -784,7 +784,7 @@ TRACK_CFLAGS = $(subst ','\'',$(CFLAGS)):\
 $(OUTPUT)PERF-CFLAGS: .FORCE-PERF-CFLAGS
         @FLAGS='$(TRACK_CFLAGS)'; \
             if test x"$$FLAGS" != x"`cat $(OUTPUT)PERF-CFLAGS 2>/dev/null`" ; then \
-                echo 1>&2 "    * new build flags or prefix"; \
+                echo 1>&2 "  FLAGS:   * new build flags or prefix"; \
                 echo "$$FLAGS" >$(OUTPUT)PERF-CFLAGS; \
             fi
 
diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include
index 1853736c8106..ee76544deecb 100644
--- a/tools/scripts/Makefile.include
+++ b/tools/scripts/Makefile.include
@@ -59,21 +59,22 @@ QUIET_SUBDIR0  = +$(MAKE) $(COMMAND_O) -C # space to separate -C and subdir
 QUIET_SUBDIR1  =
 
 ifneq ($(findstring $(MAKEFLAGS),s),s)
-ifneq ($(V),1)
-        QUIET_CC       = @echo '   ' CC $@;
-        QUIET_AR       = @echo '   ' AR $@;
-        QUIET_LINK     = @echo '   ' LINK $@;
-        QUIET_MKDIR    = @echo '   ' MKDIR $@;
-        QUIET_GEN      = @echo '   ' GEN $@;
+  ifneq ($(V),1)
+        QUIET_CC       = @echo '  CC       '$@;
+        QUIET_AR       = @echo '  AR       '$@;
+        QUIET_LINK     = @echo '  LINK     '$@;
+        QUIET_MKDIR    = @echo '  MKDIR    '$@;
+        QUIET_GEN      = @echo '  GEN      '$@;
         QUIET_SUBDIR0  = +@subdir=
-        QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '  ' SUBDIR $$subdir; \
+        QUIET_SUBDIR1  = ;$(NO_SUBDIR) \
+                          echo '  SUBDIR   '$$subdir; \
                          $(MAKE) $(PRINT_DIR) -C $$subdir
-        QUIET_FLEX     = @echo '   ' FLEX $@;
-        QUIET_BISON    = @echo '   ' BISON $@;
+        QUIET_FLEX     = @echo '  FLEX     '$@;
+        QUIET_BISON    = @echo '  BISON    '$@;
 
         descend = \
-                +@echo '   ' DESCEND $(1); \
+                +@echo         '  DESCEND  '$(1); \
                 mkdir -p $(OUTPUT)$(1) && \
                 $(MAKE) $(COMMAND_O) subdir=$(if $(subdir),$(subdir)/$(1),$(1)) $(PRINT_DIR) -C $(1) $(2)
-endif
+  endif
 endif