ubuntu doesn't like echo's -e flag in the makefile

diff --git a/Makefile b/Makefile
index caf10e3daf15bdb421f14dba85d0536f7948c48e..ccf61fa0150b4ba4bbe37bd59b1a814ed6b94e4e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -95,17 +95,17 @@ DO_RM              = $(COMMAND_RM)
 DO_IN              = $(COMMAND_IN)
 SHELL_LINE_PREFIX  =
 else
 DO_IN              = $(COMMAND_IN)
 SHELL_LINE_PREFIX  =
 else

-DO_CC              = @echo -e " CC \t$@";    $(COMMAND_CC)
-DO_CXX             = @echo -e " CXX \t$@";   $(COMMAND_CXX)
-DO_LD              = @echo -e " LD \t$@";    $(COMMAND_LD)
-DO_LDX             = @echo -e " LD \t$@";    $(COMMAND_LDX)
-DO_CCLD            = @echo -e " CCLD \t$@";  $(COMMAND_CCLD)
-DO_CXXLD           = @echo -e " CXXLD \t$@"; $(COMMAND_CXXLD)
-DO_AR              = @echo -e " AR \t$@";    $(COMMAND_AR)
-DO_RC              = @echo -e " RC \t$@";    $(COMMAND_RC)
-DO_INSTALL         = @echo -e " CP \t$2";    $(COMMAND_INSTALL)
-DO_RM              = @echo -e " RM \t$1";    $(COMMAND_RM)
-DO_IN              = @echo -e " MAKE \t$2";  $(COMMAND_IN)
+DO_CC              = @echo " CC     $@"; $(COMMAND_CC)
+DO_CXX             = @echo " CXX    $@"; $(COMMAND_CXX)
+DO_LD              = @echo " LD     $@"; $(COMMAND_LD)
+DO_LDX             = @echo " LD     $@"; $(COMMAND_LDX)
+DO_CCLD            = @echo " CCLD   $@"; $(COMMAND_CCLD)
+DO_CXXLD           = @echo " CXXLD  $@"; $(COMMAND_CXXLD)
+DO_AR              = @echo " AR     $@"; $(COMMAND_AR)
+DO_RC              = @echo " RC     $@"; $(COMMAND_RC)
+DO_INSTALL         = @echo " CP     $2"; $(COMMAND_INSTALL)
+DO_RM              = @echo " RM     $1"; $(COMMAND_RM)
+DO_IN              = @echo " MAKE   $2"; $(COMMAND_IN)

 SHELL_LINE_PREFIX  = @
 endif
 
 SHELL_LINE_PREFIX  = @
 endif
 

diff --git a/src/moof/debug.hh b/src/moof/debug.hh
index 161a8af8c68e7d31096ebbfa5be958364627c0a8..05c9d6e1c9760351cf7f8e91dc9a66cf8bd6c48b 100644 (file)
--- a/src/moof/debug.hh
+++ b/src/moof/debug.hh
@@ -19,6 +19,8 @@
 
 #include <cstdlib>             // exit
 
 
 #include <cstdlib>             // exit
 

+#include <stlplus/portability/debug.hpp>
+

 #include <moof/log.hh>
 
 
 #include <moof/log.hh>