Merge branch 'mikulka' of git@rtime.felk.cvut.cz:arc into mikulka

[arc.git] / makefile

diff --git a/makefile b/makefile
index 7ae0e60bda3a679c1d314fe21528d8b6f9880188..6b64781e01bdcf74fb4f8c405a197028774c181e 100644 (file)
--- a/makefile
+++ b/makefile
@@ -126,7 +126,7 @@ help:
        @echo "  BDIR          = ${BDIR}"\r
        @echo "  BOARDDIR      = $(BOARDDIR)"\r
        @echo "  CROSS_COMPILE = $(CROSS_COMPILE)"\r
-       @echo "  CURDIR        = $(CURDIR)"\r
+       @echo "  CURDIR        = $(CURDIR)"     \r
        @echo ""\r
 \r
 \r
@@ -136,10 +136,17 @@ test:
 show_build:\r
        @echo ""\r
        @echo "==========[ BUILD INFO ]==========="\r
-       @echo "  BDIR:          $(BDIR) [$(origin BDIR)]"\r
-       @echo "  BOARDDIR:      $(BOARDDIR) [$(origin BOARDDIR)]"\r
-       @echo "  CROSS_COMPILE: $(CROSS_COMPILE) [$(origin CROSS_COMPILE)]"\r
-       @echo "  CURDIR:        $(CURDIR)"\r
+       @echo "  BDIR:           $(BDIR) [$(origin BDIR)]"\r
+       @echo "  BOARDDIR:       $(BOARDDIR) [$(origin BOARDDIR)]"\r
+       @echo "  COMPILER:       $(COMPILER) [$(origin COMPILER)]"      \r
+ifeq ($(COMPILER),cw)  \r
+       @echo "  CW_COMPILE:     $(CW_COMPILE) [$(origin CW_COMPILE)]"\r
+else \r
+       @echo "  CROSS_COMPILE:  $(CROSS_COMPILE) [$(origin CROSS_COMPILE)]"\r
+endif\r
+       @echo "  CURDIR:         $(CURDIR)"\r
+       @echo "  SELECT_CONSOLE: $(SELECT_CONSOLE) [$(origin SELECT_CONSOLE)]"\r
+       \r
        \r
        \r
 $(dir_cmd_goals) :: show_build FORCE   \r
@@ -161,7 +168,7 @@ clean_all:
        $(Q)find . -type d -name obj_* | xargs rm -rf\r
        $(Q)find . -type f -name *.a | xargs rm -rf\r
        @echo\r
-       @echo "  >>>>>>>  DONE  <<<<<<<<<"\r
+       @echo "  >>>>>>>>>  DONE  <<<<<<<<<"\r
        @echo\r
        \r
 config: $(dir_cmd_goals)       \r
@@ -169,12 +176,12 @@ config: $(dir_cmd_goals)
 .PHONY clean:  \r
 clean: $(dir_cmd_goals)\r
        @echo\r
-       @echo "  >> Cleaning $(CURDIR)"\r
+       @echo "  >> Cleaning MAIN $(CURDIR)"\r
 #      $(Q)find . -type d -name $(objdir) | xargs rm -rf\r
-       $(Q)find . -type f -name *.a| xargs rm -rf\r
-       $(Q)rm   -rf libs/*\r
+#      $(Q)find . -type f -name *.a | xargs rm -rf\r
+#      $(Q)rm   -rf libs/*\r
        @echo\r
-       @echo "  >>>>>>>  DONE  <<<<<<<<<"\r
+       @echo "  >>>>>>>>>  DONE  <<<<<<<<<"\r
        @echo\r
 \r
                \r