Index: utils/make-banner.sh
===================================================================
--- utils/make-banner.sh	(revision 0)
+++ utils/make-banner.sh	(revision 0)
@@ -0,0 +1,232 @@
+#!/bin/sh
+##===- utils/make-banner.sh - Makefile banner support --------*- Script -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+#
+# This script is used to emit brief target banners from makefiles.
+#
+# Invoke with -help for usage.
+#
+# Usage example 1:
+#   make-banner.sh -prefix "llvm[0]:" Compiling -in Foo.cpp for Debug build
+#
+# Usage example 2:
+#   make-banner.sh \
+#     -prefix "llvm[0]:" \
+#     -bold -note "CXX=clang++" \
+#     -note "comes before suffix" \
+#     -suffix "(last stuff)" \
+#     Compiling -in "Filename with space.cpp" for Debug build
+#
+##===----------------------------------------------------------------------===##
+
+usage()
+{
+cat<<EOF
+
+usage: $0 [SECTION] [CODE...] TEXT...
+
+This script is used to emit brief target banners from makefiles.
+All text is output to sections ordered as [PREFIX][MAIN][NOTE][SUFFIX].
+
+where SECTION args are:
+  -prefix  append next TEXT to prefix section
+  -note    append next TEXT to note section enclosed in brackets
+  -suffix  append next TEXT to suffix section
+
+where CODE args are:
+  -reset   inline reset-code (all attributes off)
+  -bold    inline bold-code (eg. may use a bold terminal font)
+  -error   inline color-code for errors
+  -emph    inline color-code for emphasis
+  -in      inline color-code for generic input file (eg. source code)
+  -out     inline color-code for generic output file (eg. object file)
+  -lib     inline color-code for library
+  -exe     inline color-code for executable
+
+and TEXT:
+  Inline codes and text are added to active section. Section code is then
+  reset. Multiple arguments may be grouped via quotes.
+
+ENVIRONMENT VARIABLES
+  MAKE_BANNER_ANSI=1      enable use of ANSI escape sequences for bold/color
+  MAKE_BANNER_THEME=NAME  one of {mono,light,dark*} *=default
+  MAKE_BANNER_NOCHECK=1   do not disable ANSI for redirected stdout
+EOF
+}
+
+escape()
+{
+    if test ${ansi} -eq 0 -o $# -eq 0; then
+        escape_result=
+        return
+    fi
+    escape_result="["
+    while test $# -gt 1; do
+        escape_result="${escape_result}$1;"
+        shift
+    done
+    escape_result="${escape_result}$1m"
+    return $result
+}
+
+# check term names
+ansi=0
+if test "${MAKE_BANNER_ANSI}" == "1"; then
+    case "${TERM}" in
+        *bw*|*mono*|xtermm)
+            ;;
+        *xterm*)
+            ansi=1
+            ;;
+    esac
+fi
+
+# use ANSI color escapes only when stdout are terminals
+if test "${ansi}" -eq 1 -a \( "${MAKE_BANNER_NOCHECK}" == "1" -o -t 1 \) ; then
+    RESET=''
+
+    reset=0
+    bold=1
+
+    black=30
+    red=31
+    green=32
+    yellow=33
+    blue=34
+    magenta=35
+    cyan=36
+    white=37
+
+    bblack="1 30"
+    bred="1 31"
+    bgreen="1 32"
+    byellow="1 33"
+    bblue="1 34"
+    bmagenta="1 35"
+    bcyan="1 36"
+    bwhite="1 37"
+
+    case "${MAKE_BANNER_THEME}" in
+        mono)
+            error="${bold}"
+            emph="${bold}"
+            in="${bold}"
+            out="${bold}"
+            lib="${bold}"
+            exe="${bold}"
+            ;;
+        light)
+            error="${bred}"
+            emph="${blue}"
+            in="${green}"
+            out="${cyan}"
+            lib="${red}"
+            exe="${red}"
+            ;;
+        *|dark)
+            error="${bred}"
+            emph="${yellow}"
+            in="${green}"
+            out="${cyan}"
+            lib="${bcyan}"
+            exe="${bcyan}"
+            ;;
+    esac
+fi
+
+prefix=
+main=
+note=
+suffix=
+
+section=
+codes=
+
+for arg in "$@"
+do
+    case "${arg}" in
+        -help|--help|-h)
+            usage
+            ;;
+        -prefix)
+            section=prefix
+            ;;
+        -note)
+            section=note
+            ;;
+        -suffix)
+            section=suffix
+            ;;
+        -reset)
+            codes="${codes} ${reset}"
+            ;;
+        -bold)
+            codes="${codes} ${bold}"
+            ;;
+        -error)
+            codes="${codes} ${error}"
+            ;;
+        -emph)
+            codes="${codes} ${emph}"
+            ;;
+        -in)
+            codes="${codes} ${in}"
+            ;;
+        -out)
+            codes="${codes} ${out}"
+            ;;
+        -lib)
+            codes="${codes} ${lib}"
+            ;;
+        -exe)
+            codes="${codes} ${exe}"
+            ;;
+        *)
+            if test -n "${codes}"; then
+                escape ${codes}
+                arg="${escape_result}${arg}${RESET}"
+                codes=
+            fi
+            case "${section}" in
+                prefix)
+                    if test -n "${prefix}"; then
+                        prefix="${prefix}${arg} "
+                    else
+                        prefix="${arg} "
+                    fi
+                    ;;
+                note)
+                    if test -n "${note}"; then
+                        note="${note} [${arg}]"
+                    else
+                        note=" [${arg}]"
+                    fi
+                    ;;
+                suffix)
+                    if test -n "${suffix}"; then
+                        suffix="${suffix} ${arg}"
+                    else
+                        suffix=" ${arg}"
+                    fi
+                    ;;
+                *)
+                    if test -n "${main}"; then
+                        main="${main} ${arg}"
+                    else
+                        main="${arg}"
+                    fi
+                    ;;
+            esac
+            section=
+            ;;
+    esac
+    shift
+done
+
+echo "${RESET}${prefix}${RESET}${main}${RESET}${note}${RESET}${suffix}${RESET}"

Property changes on: utils/make-banner.sh
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:eol-style
   + native

Index: Makefile.rules
===================================================================
--- Makefile.rules	(revision 96719)
+++ Makefile.rules	(working copy)
@@ -541,6 +541,18 @@
 endif
 
 #--------------------------------------------------------------------
+# Target banners
+#--------------------------------------------------------------------
+Banner.sh = $(LLVM_SRC_ROOT)/utils/make-banner.sh
+Banner.flags =
+Banner.prefix = llvm[$(MAKELEVEL)]:
+Banner.suffix =
+
+Banner = @$(Banner.sh) $(Banner.flags) \
+    -prefix "$(Banner.prefix)" \
+    -suffix "$(Banner.suffix)"
+
+#--------------------------------------------------------------------
 # Adjust to user's request
 #--------------------------------------------------------------------
 
@@ -1055,13 +1067,14 @@
 SharedLibKindMessage := "Shared Library"
 endif
 $(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(LibDir)/.dir
-	$(Echo) Linking $(BuildMode) $(SharedLibKindMessage) \
-	  $(LIBRARYNAME)$(SHLIBEXT)
+	$(Banner) Linking $(BuildMode) $(SharedLibKindMessage) \
+	  -lib "$(LIBRARYNAME)$(SHLIBEXT)"
 	$(Verb) $(Link) $(SharedLinkOptions) -o $@ $(ObjectsO) \
 	  $(ProjLibsOptions) $(LLVMLibsOptions) $(LIBS)
 else
 $(LibName.SO): $(ObjectsO) $(LibDir)/.dir
-	$(Echo) Linking $(BuildMode) Shared Library $(LIBRARYNAME)$(SHLIBEXT)
+	$(Banner) Linking $(BuildMode) Shared Library \
+	  -lib "$(LIBRARYNAME)$(SHLIBEXT)"
 	$(Verb) $(Link) $(SharedLinkOptions) -o $@ $(ObjectsO)
 endif
 
@@ -1178,7 +1191,7 @@
 all-local:: $(LibName.A)
 
 $(LibName.A): $(ObjectsO) $(LibDir)/.dir
-	$(Echo) Building $(BuildMode) Archive Library $(notdir $@)
+	$(Banner) Building $(BuildMode) Archive Library -lib $(notdir $@)
 	-$(Verb) $(RM) -f $@
 	$(Verb) $(Archive) $@ $(ObjectsO)
 	$(Verb) $(Ranlib) $@
@@ -1279,18 +1292,18 @@
 endif
 
 $(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
-	$(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg)
+	$(Banner) Linking $(BuildMode) executable -exe "$(TOOLNAME)" $(StripWarnMsg)
 	$(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \
 	$(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS)
-	$(Echo) ======= Finished Linking $(BuildMode) Executable $(TOOLNAME) \
+	$(Banner) ======= Finished Linking $(BuildMode) Executable -exe $(TOOLNAME) \
           $(StripWarnMsg)
 
 ifneq ($(strip $(ToolAliasBuildPath)),)
 $(ToolAliasBuildPath): $(ToolBuildPath)
-	$(Echo) Creating $(BuildMode) Alias $(TOOLALIAS) $(StripWarnMsg)
+	$(Banner) Creating $(BuildMode) Alias -out "$(TOOLALIAS)" $(StripWarnMsg)
 	$(Verb) $(RM) -f $(ToolAliasBuildPath)
 	$(Verb) $(AliasTool) $(TOOLEXENAME) $(ToolAliasBuildPath)
-	$(Echo) ======= Finished Creating $(BuildMode) Alias $(TOOLNAME) \
+	$(Banner) ======= Finished Creating $(BuildMode) Alias -out "$(TOOLNAME)" \
           $(StripWarnMsg)
 endif
 
@@ -1356,17 +1369,17 @@
                   else $(RM) "$(ObjDir)/$*.d.tmp"; exit 1; fi
 
 $(ObjDir)/%.o: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) $(PROJ_SRC_DIR)/Makefile
-	$(Echo) "Compiling $*.cpp for $(BuildMode) build" $(PIC_FLAG)
+	$(Banner) Compiling -in "$*.cpp" for $(BuildMode) build $(PIC_FLAG)
 	$(Verb) if $(Compile.CXX) $(DEPEND_OPTIONS) $< -o $(ObjDir)/$*.o ; \
 	        $(DEPEND_MOVEFILE)
 
 $(ObjDir)/%.o: %.cc $(ObjDir)/.dir $(BUILT_SOURCES) $(PROJ_SRC_DIR)/Makefile
-	$(Echo) "Compiling $*.cc for $(BuildMode) build" $(PIC_FLAG)
+	$(Banner) Compiling -in "$*.cc" for $(BuildMode) build $(PIC_FLAG)
 	$(Verb) if $(Compile.CXX) $(DEPEND_OPTIONS) $< -o $(ObjDir)/$*.o ; \
 	        $(DEPEND_MOVEFILE)
 
 $(ObjDir)/%.o: %.c $(ObjDir)/.dir $(BUILT_SOURCES) $(PROJ_SRC_DIR)/Makefile
-	$(Echo) "Compiling $*.c for $(BuildMode) build" $(PIC_FLAG)
+	$(Banner) Compiling -in "$*.c" for $(BuildMode) build $(PIC_FLAG)
 	$(Verb) if $(Compile.C) $(DEPEND_OPTIONS) $< -o $(ObjDir)/$*.o ; \
 	        $(DEPEND_MOVEFILE)
 
@@ -1521,82 +1534,82 @@
 
 $(TARGET:%=$(ObjDir)/%GenRegisterNames.inc.tmp): \
 $(ObjDir)/%GenRegisterNames.inc.tmp : %.td $(ObjDir)/.dir
-	$(Echo) "Building $(<F) register names with tblgen"
+	$(Banner) Building -in "$(<F)" "register names with tblgen"
 	$(Verb) $(TableGen) -gen-register-enums -o $(call SYSPATH, $@) $<
 
 $(TARGET:%=$(ObjDir)/%GenRegisterInfo.h.inc.tmp): \
 $(ObjDir)/%GenRegisterInfo.h.inc.tmp : %.td $(ObjDir)/.dir
-	$(Echo) "Building $(<F) register information header with tblgen"
+	$(Banner) Building -in "$(<F)" "register information header with tblgen"
 	$(Verb) $(TableGen) -gen-register-desc-header -o $(call SYSPATH, $@) $<
 
 $(TARGET:%=$(ObjDir)/%GenRegisterInfo.inc.tmp): \
 $(ObjDir)/%GenRegisterInfo.inc.tmp : %.td $(ObjDir)/.dir
-	$(Echo) "Building $(<F) register info implementation with tblgen"
+	$(Banner) Building -in "$(<F)" "register info implementation with tblgen"
 	$(Verb) $(TableGen) -gen-register-desc -o $(call SYSPATH, $@) $<
 
 $(TARGET:%=$(ObjDir)/%GenInstrNames.inc.tmp): \
 $(ObjDir)/%GenInstrNames.inc.tmp : %.td $(ObjDir)/.dir
-	$(Echo) "Building $(<F) instruction names with tblgen"
+	$(Banner) Building -in "$(<F)" "instruction names with tblgen"
 	$(Verb) $(TableGen) -gen-instr-enums -o $(call SYSPATH, $@) $<
 
 $(TARGET:%=$(ObjDir)/%GenInstrInfo.inc.tmp): \
 $(ObjDir)/%GenInstrInfo.inc.tmp : %.td $(ObjDir)/.dir
-	$(Echo) "Building $(<F) instruction information with tblgen"
+	$(Banner) Building -in "$(<F)" "instruction information with tblgen"
 	$(Verb) $(TableGen) -gen-instr-desc -o $(call SYSPATH, $@) $<
 
 $(TARGET:%=$(ObjDir)/%GenAsmWriter.inc.tmp): \
 $(ObjDir)/%GenAsmWriter.inc.tmp : %.td $(ObjDir)/.dir
-	$(Echo) "Building $(<F) assembly writer with tblgen"
+	$(Banner) Building -in "$(<F)" "assembly writer with tblgen"
 	$(Verb) $(TableGen) -gen-asm-writer -o $(call SYSPATH, $@) $<
 
 $(TARGET:%=$(ObjDir)/%GenAsmWriter1.inc.tmp): \
 $(ObjDir)/%GenAsmWriter1.inc.tmp : %.td $(ObjDir)/.dir
-	$(Echo) "Building $(<F) assembly writer #1 with tblgen"
+	$(Banner) Building -in "$(<F)" "assembly writer #1 with tblgen"
 	$(Verb) $(TableGen) -gen-asm-writer -asmwriternum=1 -o $(call SYSPATH, $@) $<
 
 $(TARGET:%=$(ObjDir)/%GenAsmMatcher.inc.tmp): \
 $(ObjDir)/%GenAsmMatcher.inc.tmp : %.td $(ObjDir)/.dir
-	$(Echo) "Building $(<F) assembly matcher with tblgen"
+	$(Banner) Building -in "$(<F)" "assembly matcher with tblgen"
 	$(Verb) $(TableGen) -gen-asm-matcher -o $(call SYSPATH, $@) $<
 
 $(TARGET:%=$(ObjDir)/%GenCodeEmitter.inc.tmp): \
 $(ObjDir)/%GenCodeEmitter.inc.tmp: %.td $(ObjDir)/.dir
-	$(Echo) "Building $(<F) code emitter with tblgen"
+	$(Banner) Building -in "$(<F)" "code emitter with tblgen"
 	$(Verb) $(TableGen) -gen-emitter -o $(call SYSPATH, $@) $<
 
 $(TARGET:%=$(ObjDir)/%GenDAGISel.inc.tmp): \
 $(ObjDir)/%GenDAGISel.inc.tmp : %.td $(ObjDir)/.dir
-	$(Echo) "Building $(<F) DAG instruction selector implementation with tblgen"
+	$(Banner) Building -in "$(<F)" "DAG instruction selector implementation with tblgen"
 	$(Verb) $(TableGen) -gen-dag-isel -o $(call SYSPATH, $@) $<
 
 $(TARGET:%=$(ObjDir)/%GenDisassemblerTables.inc.tmp): \
 $(ObjDir)/%GenDisassemblerTables.inc.tmp : %.td $(ObjDir)/.dir
-	$(Echo) "Building $(<F) disassembly tables with tblgen"
+	$(Banner) Building -in "$(<F)" "disassembly tables with tblgen"
 	$(Verb) $(TableGen) -gen-disassembler -o $(call SYSPATH, $@) $<
 
 $(TARGET:%=$(ObjDir)/%GenEDInfo.inc.tmp): \
 $(ObjDir)/%GenEDInfo.inc.tmp : %.td $(ObjDir)/.dir
-	$(Echo) "Building $(<F) enhanced disassembly information with tblgen"
+	$(Banner) Building -in "$(<F)" "enhanced disassembly information with tblgen"
 	$(Verb) $(TableGen) -gen-enhanced-disassembly-info -o $(call SYSPATH, $@) $<
 
 $(TARGET:%=$(ObjDir)/%GenFastISel.inc.tmp): \
 $(ObjDir)/%GenFastISel.inc.tmp : %.td $(ObjDir)/.dir
-	$(Echo) "Building $(<F) \"fast\" instruction selector implementation with tblgen"
+	$(Banner) Building -in "$(<F)" "\"fast\" instruction selector implementation with tblgen"
 	$(Verb) $(TableGen) -gen-fast-isel -o $(call SYSPATH, $@) $<
 
 $(TARGET:%=$(ObjDir)/%GenSubtarget.inc.tmp): \
 $(ObjDir)/%GenSubtarget.inc.tmp : %.td $(ObjDir)/.dir
-	$(Echo) "Building $(<F) subtarget information with tblgen"
+	$(Banner) Building -in "$(<F)" "subtarget information with tblgen"
 	$(Verb) $(TableGen) -gen-subtarget -o $(call SYSPATH, $@) $<
 
 $(TARGET:%=$(ObjDir)/%GenCallingConv.inc.tmp): \
 $(ObjDir)/%GenCallingConv.inc.tmp : %.td $(ObjDir)/.dir
-	$(Echo) "Building $(<F) calling convention information with tblgen"
+	$(Banner) Building -in "$(<F)" "calling convention information with tblgen"
 	$(Verb) $(TableGen) -gen-callingconv -o $(call SYSPATH, $@) $<
 
 $(TARGET:%=$(ObjDir)/%GenIntrinsics.inc.tmp): \
 $(ObjDir)/%GenIntrinsics.inc.tmp : %.td $(ObjDir)/.dir
-	$(Echo) "Building $(<F) intrinsics information with tblgen"
+	$(Banner) Building -in "$(<F)" "intrinsics information with tblgen"
 	$(Verb) $(TableGen) -gen-tgt-intrinsic -o $(call SYSPATH, $@) $<
 
 clean-local::
Index: Makefile
===================================================================
--- Makefile	(revision 96719)
+++ Makefile	(working copy)
@@ -172,12 +172,12 @@
 # that it gets executed last.
 ifneq ($(BUILD_DIRS_ONLY),1)
 all::
-	$(Echo) '*****' Completed $(BuildMode)$(AssertMode) Build
+	$(Banner) '*****' -emph "Completed $(BuildMode)$(AssertMode) Build"
 ifeq ($(BuildMode),Debug)
-	$(Echo) '*****' Note: Debug build can be 10 times slower than an
-	$(Echo) '*****' optimized build. Use 'make ENABLE_OPTIMIZED=1' to
-	$(Echo) '*****' make an optimized build. Alternatively you can
-	$(Echo) '*****' configure with --enable-optimized.
+	$(Banner) '*****' -emph "Note: Debug build can be 10 times slower than an"
+	$(Banner) '*****' -emph "optimized build. Use 'make ENABLE_OPTIMIZED=1' to"
+	$(Banner) '*****' -emph "make an optimized build. Alternatively you can"
+	$(Banner) '*****' -emph "configure with --enable-optimized."
 endif
 endif