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

Commit 65fb0992 authored by Ingo Molnar's avatar Ingo Molnar Committed by Arnaldo Carvalho de Melo
Browse files

tools: Harmonize the various build messages in perf, lib-traceevent, lib-lk 



The various build lines from libtraceevent and perf mix up during a
parallel build and produce unaligned output like:

    CC builtin-buildid-list.o
    CC builtin-buildid-cache.o
    CC builtin-list.o
  CC FPIC            trace-seq.o
    CC builtin-record.o
  CC FPIC            parse-filter.o
    CC builtin-report.o
    CC builtin-stat.o
  CC FPIC            parse-utils.o
  CC FPIC            kbuffer-parse.o
    CC builtin-timechart.o
    CC builtin-top.o
    CC builtin-script.o
  BUILD STATIC LIB   libtraceevent.a
    CC builtin-probe.o
    CC builtin-kmem.o
    CC builtin-lock.o

To solve this, harmonize all the build message alignments to be similar
to the kernel's kbuild output: prefixed by two spaces and 11-char wide.

After the patch the output looks pretty tidy, even if output lines get
mixed up:

  CC      builtin-annotate.o
  FLAGS:  * new build flags or cross compiler
  CC      builtin-bench.o
  AR      liblk.a
  CC      bench/sched-messaging.o
  CC FPIC event-parse.o
  CC      bench/sched-pipe.o
  CC FPIC trace-seq.o
  CC      bench/mem-memcpy.o
  CC      bench/mem-memset.o
  CC FPIC parse-filter.o
  CC      builtin-diff.o
  CC      builtin-evlist.o
  CC      builtin-help.o

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-3-git-send-email-mingo@kernel.org


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

tools/lib/traceevent/Makefile

+9 −9
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ else 
  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_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
@@ -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

tools/perf/Documentation/Makefile

+9 −8
Original line number Diff line number Diff line
@@ -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

tools/perf/Makefile.perf

+1 −1
Original line number Diff line number Diff line
@@ -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

tools/scripts/Makefile.include

+12 −11
Original line number Diff line number Diff line
@@ -60,19 +60,20 @@ 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 $@;

	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

tools/perf/Makefile

+1 −1

File changed.

Contains only whitespace changes.