From 84b2539b604e9b7781aa0bd56a09b2736b661ce2 Mon Sep 17 00:00:00 2001
From: Sebastian <basti@sraa.de>
Date: Mon, 16 Dec 2013 23:00:56 +0100
Subject: [PATCH] makefiles: call GNU /bin/echo directly instead

GNU echo requires the "-e" switch to handle escape sequences. Other versions
(usually shell-builtins) print out the switch or don't handle the sequences at
all. POSIX doesn't specify any behaviour, pointing to printf for consistency.

Call GNU's /bin/echo directly to pretty-print make output.
---
 aesa/Makefile    |  2 +-
 minidol/Makefile | 17 +++++++++--------
 square/Makefile  |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/aesa/Makefile b/aesa/Makefile
index 8a25551..39a2f15 100644
--- a/aesa/Makefile
+++ b/aesa/Makefile
@@ -18,7 +18,7 @@ SYSTEMC_LIB = $(HOME)/systemc/lib-linux64/libsystemc.a
 JAVA	?= java
 JAVAC	?= javac
 DOTTY	?= dotty
-ECHO	?= echo
+ECHO	?= /bin/echo -e
 SED	?= sed
 CP	?= cp
 RM	?= rm
diff --git a/minidol/Makefile b/minidol/Makefile
index 12738f4..e97db72 100644
--- a/minidol/Makefile
+++ b/minidol/Makefile
@@ -13,6 +13,7 @@ EDEST	:= eobj
 ELIB	:= lib
 
 # Host application and host objects
+ECHO	= /bin/echo -e
 HOSTAPP	= $(DEST)/ep_application
 HOBJS	= $(HDEST)/main.o
 
@@ -43,38 +44,38 @@ host: $(HOSTAPP)
 cores: $(ECOMMON) $(EWRAPPERS) $(EPAPPS)
 
 run: host cores
-	@echo -e "\tRUN"
+	@$(ECHO) "\tRUN"
 	@sudo LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \
 	      EPIPHANY_HDF=$(EPIPHANY_HDF) \
 	      $(HOSTAPP)
 
 clean:
-	@echo -e "\tCLEAN"
+	@$(ECHO) "\tCLEAN"
 	@rm -v -f $(HOSTAPP) $(EPAPPS) $(EDEST)/* $(HDEST)/*
 
 # Host rules
 $(HOSTAPP): $(HOBJS)
-	@echo -e "\t(HOST)     LINK\t$@"
+	@$(ECHO) "\t(HOST)     LINK\t$@"
 	@$(HOSTCC) -o $@ $^ $(HLFLAGS)
 
 $(HDEST)/%.o: $(HSRC)/%.c
-	@echo -e "\t(HOST)     CC\t$@"
+	@$(ECHO) "\t(HOST)     CC\t$@"
 	@$(HOSTCC) $(HCFLAGS) -c -o $@ $^
 
 # Epiphany rules
 $(DEST)/%.srec: $(EDEST)/%.elf
-	@echo -e "\t(EPIPHANY) OBJCOPY $@"
+	@$(ECHO) "\t(EPIPHANY) OBJCOPY $@"
 	@$(OBJCOPY) $(OCFLAGS) --output-target srec --srec-forceS3 $^ $@
 
 $(EDEST)/%.elf: $(EDEST)/%.o $(EDEST)/%_Wrapper.o $(ECOMMON)
-	@echo -e "\t(EPIPHANY) LINK\t$@"
+	@$(ECHO) "\t(EPIPHANY) LINK\t$@"
 	@$(CC) -o $@ $^ $(LFLAGS)
 
 $(EDEST)/%.o: $(ESRC)/%.c
-	@echo -e "\t(EPIPHANY) CC\t$@"
+	@$(ECHO) "\t(EPIPHANY) CC\t$@"
 	@$(CC) $(CFLAGS) -c -o $@ $^
 
 $(EDEST)/%.o: $(ELIB)/%.c
-	@echo -e "\t(EPIPHANY) CC\t$@"
+	@$(ECHO) "\t(EPIPHANY) CC\t$@"
 	@$(CC) $(CFLAGS) -c -o $@ $^
 
diff --git a/square/Makefile b/square/Makefile
index fc78207..0bd09d1 100644
--- a/square/Makefile
+++ b/square/Makefile
@@ -18,7 +18,7 @@ SYSTEMC_LIB = $(HOME)/systemc/lib-linux64/libsystemc.a
 JAVA	?= java
 JAVAC	?= javac
 DOTTY	?= dotty
-ECHO	?= echo
+ECHO	?= /bin/echo -e
 SED	?= sed
 CP	?= cp
 RM	?= rm
-- 
2.30.2