summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-06-21 13:40:02 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-06-21 13:40:02 (GMT)
commit2670454a4db200f79853a2f1d75b4db426b7bd77 (patch)
treec65ab67962dd9d04d40b9c05ee91ac1e094b3dcb
parentbb0dc4a60625c94fac1fb8dada797243b2b83c9e (diff)
downloadswift-contrib-2670454a4db200f79853a2f1d75b4db426b7bd77.zip
swift-contrib-2670454a4db200f79853a2f1d75b4db426b7bd77.tar.bz2
Colorized build now uses tput instead of ANSI color codes.
Avoids strange '-e' occurrences on platforms such as Ubuntu.
-rw-r--r--Makefile15
1 files changed, 5 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index f94111c..dc9b8c2 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,6 @@ ARFLAGS = rcs
# Echoing
################################################################################
-ifeq ($(shell echo -e),-e)
-ECHO_E=
-else
-ECHO_E=-e
-endif
ifneq ($(findstring $(MAKEFLAGS),s),s)
ifndef V
ifeq ($(C),0)
@@ -23,11 +18,11 @@ QUIET_CXX = @echo " " "CXX " $@;
QUIET_AR = @echo " " "AR " $@;
QUIET_LINK = @echo " " "LINK" $@;
else
-QUIET_MM = @echo $(ECHO_E) " \033[0;35;140m" "MM " "\033[0m" $@;
-QUIET_CC = @echo $(ECHO_E) " \033[0;33;140m" "CC " "\033[0m" $@;
-QUIET_CXX = @echo $(ECHO_E) " \033[0;32;140m" "CXX " "\033[0m" $@;
-QUIET_AR = @echo $(ECHO_E) " \033[0;31;140m" "AR " "\033[0m" $@;
-QUIET_LINK = @echo $(ECHO_E) " \033[0;36;140m" "LINK" "\033[0m" $@;
+QUIET_MM = @echo " $(shell tput setaf 5)MM$(shell tput sgr0) " $@;
+QUIET_CC = @echo " $(shell tput setaf 3)CC$(shell tput sgr0) " $@;
+QUIET_CXX = @echo " $(shell tput setaf 2)CXX$(shell tput sgr0) " $@;
+QUIET_AR = @echo " $(shell tput setaf 1)AR$(shell tput sgr0) " $@;
+QUIET_LINK = @echo " $(shell tput setaf 6)LINK$(shell tput sgr0)" $@;
endif
endif
endif