From 3c9f192267dda6f1ec1d9c40ff42d9da1240d75e Mon Sep 17 00:00:00 2001
From: Russ Rowan <neuromancer@HAL-9000.(none)>
Date: Thu, 15 Dec 2005 02:44:15 -0500
Subject: [PATCH] Colorize Pasky's build system a bit.

---
 Makefile.config.in |  2 ++
 Makefile.lib       | 28 +++++++++++++++++++---------
 configure.in       |  9 +++++++++
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index 50b3eb1b..4eb8e485 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -158,6 +158,8 @@ INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src
 
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
 
+MAKE_COLOR = @MAKE_COLOR@
+
 
 ### This is here because Makefile.config is usually the first thing
 ### we get and sometimes the all rule can be implicit, yet we want
diff --git a/Makefile.lib b/Makefile.lib
index e3cf4652..e2f78669 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -14,36 +14,46 @@ else
 	mquiet = quiet_
 endif
 
+# Colorize the build.
+ifdef MAKE_COLOR
+	INFO_COLOR    = \033[0;35m
+	CC_COLOR      = \033[0;36m
+	LD_COLOR      = \033[0;32m
+	LINK_COLOR    = \033[1;34m
+	INSTALL_COLOR = \033[0;33m
+	END_COLOR     = \033[0;0m
+endif
+
 # Show the command (quiet or non-quiet version based on the assignment
 # just above) and then execute it.
-ncmd = $(if $($(quiet)cmd_$(1)),echo $($(quiet)cmd_$(1)) &&) $(cmd_$(1))
-cmd = @$(if $($(quiet)cmd_$(1)),echo $($(quiet)cmd_$(1)) &&) $(cmd_$(1))
-mcmd = @$(if $($(mquiet)cmd_$(1)),echo $($(mquiet)cmd_$(1)) &&) $(cmd_$(1))
+ncmd = $(if $($(quiet)cmd_$(1)),echo -e $($(quiet)cmd_$(1)) &&) $(cmd_$(1))
+cmd = @$(if $($(quiet)cmd_$(1)),echo -e $($(quiet)cmd_$(1)) &&) $(cmd_$(1))
+mcmd = @$(if $($(mquiet)cmd_$(1)),echo -e $($(mquiet)cmd_$(1)) &&) $(cmd_$(1))
 
-quiet_cmd_compile = '      [CC]   $(RELPATH)$@'
+quiet_cmd_compile = '      [$(CC_COLOR)CC$(END_COLOR)]   $(RELPATH)$@'
  masq_cmd_compile = $(COMPILE) -c $<
       cmd_compile = $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
 
 # Rule to compile a set of .o files into one .o file
-quiet_cmd_ld_objs = "      [LD]   $(RELPATH)$@"
+quiet_cmd_ld_objs = "      [$(LD_COLOR)LD$(END_COLOR)]   $(RELPATH)$@"
       cmd_ld_objs = $(LD) -r -o $@ $(filter $(OBJS), $^) \
       		    $(foreach subdir,$(sort $(filter-out src,$(SUBDIRS))), \
 			    `test -e $(subdir)/lib.o && echo $(subdir)/lib.o`)
 
-   quiet_cmd_link = '    [LINK]   $(RELPATH)$@'
+   quiet_cmd_link = '    [$(LINK_COLOR)LINK$(END_COLOR)]   $(RELPATH)$@'
          cmd_link = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 
  quiet_cmd_sparse = '    [SPARSE]   $(RELPATH)$(2)'
        cmd_sparse = $(SPARSE) $(DEFS) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) $(SPARSE_FLAGS) $(2)
 
 # Recursive make
-quiet_cmd_recmake = "[MAKE $(3)]   $(RELPATH)$(2)"
+quiet_cmd_recmake = "[$(INFO_COLOR)MAKE $(3)$(END_COLOR)]   $(RELPATH)$(2)"
       cmd_recmake = $(MAKE) -C $(2) $(3)
 
-quiet_cmd_installdata = "     [INSTALL]   $(RELPATH)$(2) -> $(3)"
+quiet_cmd_installdata = "     [$(INSTALL_COLOR)INSTALL$(END_COLOR)]   $(RELPATH)$(2) -> $(3)"
       cmd_installdata = $(INSTALL_DATA) $(2) $(3)
 
-quiet_cmd_installprog = "     [INSTALL]   $(RELPATH)$(2) -> $(3)"
+quiet_cmd_installprog = "     [$(INSTALL_COLOR)INSTALL$(END_COLOR)]   $(RELPATH)$(2) -> $(3)"
       cmd_installprog = $(INSTALL_PROGRAM) $(2) $(3)
 
 
diff --git a/configure.in b/configure.in
index cea40da8..fb37328b 100644
--- a/configure.in
+++ b/configure.in
@@ -1257,6 +1257,15 @@ ALL_CFLAGS="$CFLAGS $CPPFLAGS"
 EL_LOG_CONFIG(ALL_CFLAGS, [Compiler options (CFLAGS)], [])
 EL_LOG_CONFIG(LIBS, [Linker options (LIBS)], [])
 
+dnl ===================================================================
+dnl Colored make output
+dnl ===================================================================
+
+if test $(`which tput` colors) -ge 4; then
+	MAKE_COLOR=1
+	AC_SUBST(MAKE_COLOR)
+fi
+
 dnl ===================================================================
 dnl Generated files
 dnl ===================================================================