Correct some issues with last check-in; ez80 still does not build

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5339 42af7a65-404d-4744-a932-0658087f49c3
2012-11-11 23:44:31 +00:00 · 2012-11-11 23:44:31 +00:00 · 96e153c0d2
parent dab0480f31
commit 96e153c0d2
132 changed files with 779 additions and 664 deletions
--- a/apps/examples/adc/Makefile
+++ b/apps/examples/adc/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/buttons/Makefile
+++ b/apps/examples/buttons/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/can/Makefile
+++ b/apps/examples/can/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/cdcacm/Makefile
+++ b/apps/examples/cdcacm/Makefile
@ -80,7 +80,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -91,7 +91,7 @@ $(COBJS): %$(OBJEXT): %.c
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/composite/Makefile
+++ b/apps/examples/composite/Makefile
@ -80,7 +80,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -93,7 +93,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/cxxtest/Makefile
+++ b/apps/examples/cxxtest/Makefile
@ -93,7 +93,7 @@ $(CXXOBJS): %$(OBJEXT): %.cxx
 	$(call COMPILEXX, $<, $@)

 .built: chkcxx $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -105,7 +105,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/dhcpd/Makefile
+++ b/apps/examples/dhcpd/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/discover/Makefile
+++ b/apps/examples/discover/Makefile
@ -77,7 +77,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -89,7 +89,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/elf/Makefile
+++ b/apps/examples/elf/Makefile
@ -75,7 +75,7 @@ $(COBJS): %$(OBJEXT): %.c
 # generating the source files.

 really_build: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .built:
--- a/apps/examples/ftpc/Makefile
+++ b/apps/examples/ftpc/Makefile
@ -74,7 +74,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 # Register application
@ -88,7 +88,7 @@ context: .context
 # Create dependencies

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/ftpd/Makefile
+++ b/apps/examples/ftpd/Makefile
@ -71,7 +71,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -84,7 +84,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/hello/Makefile
+++ b/apps/examples/hello/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/helloxx/Makefile
+++ b/apps/examples/helloxx/Makefile
@ -93,7 +93,7 @@ $(CXXOBJS): %$(OBJEXT): %.cxx
 	$(call COMPILEXX, $<, $@)

 .built: chkcxx $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -105,7 +105,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/hidkbd/Makefile
+++ b/apps/examples/hidkbd/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/igmp/Makefile
+++ b/apps/examples/igmp/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/json/Makefile
+++ b/apps/examples/json/Makefile
@ -74,7 +74,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -86,7 +86,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/lcdrw/Makefile
+++ b/apps/examples/lcdrw/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/mm/Makefile
+++ b/apps/examples/mm/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/modbus/Makefile
+++ b/apps/examples/modbus/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/mount/Makefile
+++ b/apps/examples/mount/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/nettest/Makefile
+++ b/apps/examples/nettest/Makefile
@ -112,7 +112,7 @@ $(HOST_BIN): $(HOST_OBJS)
 	@$(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@

 .built: $(TARG_OBJS)
-	$(call ARCHIVE, $@, "$(TARG_OBJS)")
+	$(call ARCHIVE, $(BIN), "$(TARG_OBJS)")
 	@touch .built

 .context:
@ -124,7 +124,7 @@ endif
 context: .context

 .depend: Makefile $(TARG_SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(TARG_SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(TARG_SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/nsh/Makefile
+++ b/apps/examples/nsh/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/null/Makefile
+++ b/apps/examples/null/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/nx/Makefile
+++ b/apps/examples/nx/Makefile
@ -79,7 +79,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -91,7 +91,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/nxconsole/Makefile
+++ b/apps/examples/nxconsole/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/nxffs/Makefile
+++ b/apps/examples/nxffs/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/nxflat/Makefile
+++ b/apps/examples/nxflat/Makefile
@ -73,7 +73,7 @@ headers:
 	@$(MAKE) -C tests TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:
--- a/apps/examples/nxhello/Makefile
+++ b/apps/examples/nxhello/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/nximage/Makefile
+++ b/apps/examples/nximage/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/nxlines/Makefile
+++ b/apps/examples/nxlines/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/nxtext/Makefile
+++ b/apps/examples/nxtext/Makefile
@ -80,7 +80,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -92,7 +92,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/ostest/Makefile
+++ b/apps/examples/ostest/Makefile
@ -120,7 +120,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -132,7 +132,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/pashello/Makefile
+++ b/apps/examples/pashello/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/pipe/Makefile
+++ b/apps/examples/pipe/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/poll/Makefile
+++ b/apps/examples/poll/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 # Register application
--- a/apps/examples/pwm/Makefile
+++ b/apps/examples/pwm/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -86,7 +86,7 @@ $(COBJS): %$(OBJEXT): %.c
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/qencoder/Makefile
+++ b/apps/examples/qencoder/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/relays/Makefile
+++ b/apps/examples/relays/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/rgmp/Makefile
+++ b/apps/examples/rgmp/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/romfs/Makefile
+++ b/apps/examples/romfs/Makefile
@ -86,13 +86,13 @@ romfs_testdir.h : testdir.img
 	@xxd -i $< >$@ || { echo "xxd of $< failed" ; exit 1 ; }

 .built: romfs_testdir.h $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 # Register application
--- a/apps/examples/sendmail/Makefile
+++ b/apps/examples/sendmail/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 # Register application
--- a/apps/examples/serloop/Makefile
+++ b/apps/examples/serloop/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 # Register application
--- a/apps/examples/telnetd/Makefile
+++ b/apps/examples/telnetd/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/thttpd/Makefile
+++ b/apps/examples/thttpd/Makefile
@ -73,13 +73,13 @@ headers:
 	@$(MAKE) -C content TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV)

 .built: headers $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/tiff/Makefile
+++ b/apps/examples/tiff/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/touchscreen/Makefile
+++ b/apps/examples/touchscreen/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/udp/Makefile
+++ b/apps/examples/udp/Makefile
@ -106,7 +106,7 @@ $(HOST_BIN): $(HOST_OBJS)
 context:

 .depend: Makefile $(TARG_SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(TARG_SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(TARG_SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/uip/Makefile
+++ b/apps/examples/uip/Makefile
@ -70,7 +70,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 httpd_fsdata.c: httpd-fs/*
@ -79,7 +79,7 @@ httpd_fsdata.c: httpd-fs/*
 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 epend: .depend
--- a/apps/examples/usbserial/Makefile
+++ b/apps/examples/usbserial/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/usbstorage/Makefile
+++ b/apps/examples/usbstorage/Makefile
@ -80,7 +80,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -93,7 +93,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/usbterm/Makefile
+++ b/apps/examples/usbterm/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/watchdog/Makefile
+++ b/apps/examples/watchdog/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -86,7 +86,7 @@ $(COBJS): %$(OBJEXT): %.c
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/wget/Makefile
+++ b/apps/examples/wget/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/wgetjson/Makefile
+++ b/apps/examples/wgetjson/Makefile
@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -88,7 +88,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/wlan/Makefile
+++ b/apps/examples/wlan/Makefile
@ -71,13 +71,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/examples/xmlrpc/Makefile
+++ b/apps/examples/xmlrpc/Makefile
@ -77,7 +77,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -89,7 +89,7 @@ endif
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/graphics/tiff/Makefile
+++ b/apps/graphics/tiff/Makefile
@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/interpreters/ficl/Makefile
+++ b/apps/interpreters/ficl/Makefile
@ -95,13 +95,13 @@ debug:
 	@#echo "CFLAGS: $(CFLAGS)"

 .built: debug $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: debug Makefile $(SRCS)
-	@$(MKDEP) $(ROOT_DEPPATH) $(SRC_DEPPATH) $(FICL_DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOT_DEPPATH) $(SRC_DEPPATH) $(FICL_DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/modbus/Makefile
+++ b/apps/modbus/Makefile
@ -88,7 +88,7 @@ endif

 .built: $(OBJS)
 ifeq ($(CONFIG_MODBUS),y)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built
 endif

@ -96,8 +96,7 @@ context:

 .depend: Makefile $(SRCS)
 ifeq ($(CONFIG_MODBUS),y)
-	@$(MKDEP) $(DEPPATH) \
-	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@
 endif

--- a/apps/namedapp/Makefile
+++ b/apps/namedapp/Makefile
@ -55,9 +55,9 @@ SRCS		= $(ASRCS) $(CSRCS)
 OBJS		= $(AOBJS) $(COBJS)

 ifeq ($(WINTOOL),y)
-  BIN		= "${shell cygpath -w  $(APPDIR)/libapps$(LIBEXT)}"
+  BIN		= ..\\libapps$(LIBEXT)
 else
-  BIN		= "$(APPDIR)/libapps$(LIBEXT)"
+  BIN		= ../libapps$(LIBEXT)
 endif

 ROOTDEPPATH	= --dep-path .
@ -75,30 +75,30 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
-	@touch .built
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
+	$(Q) touch .built

 .context:
 	@echo "/* List of application requirements, generated during make context. */" > namedapp_list.h
 	@echo "/* List of application entry points, generated during make context. */" > namedapp_proto.h
-	@touch $@
+	$(Q) touch $@

 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@

 depend: .depend

 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(Q) rm -f *.o *~ .*.swp .built
 	$(call CLEAN)

 distclean: clean
-	@rm -f .context Make.dep .depend
-	@rm -f namedapp_list.h
-	@rm -f namedapp_proto.h
+	$(Q) rm -f .context Make.dep .depend
+	$(Q) rm -f namedapp_list.h
+	$(Q) rm -f namedapp_proto.h

 -include Make.dep

--- a/apps/netutils/codecs/Makefile
+++ b/apps/netutils/codecs/Makefile
@ -68,13 +68,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/netutils/dhcpc/Makefile
+++ b/apps/netutils/dhcpc/Makefile
@ -74,13 +74,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/netutils/dhcpd/Makefile
+++ b/apps/netutils/dhcpd/Makefile
@ -74,13 +74,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/netutils/discover/Makefile
+++ b/apps/netutils/discover/Makefile
@ -77,13 +77,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/netutils/ftpc/Makefile
+++ b/apps/netutils/ftpc/Makefile
@ -90,13 +90,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/netutils/ftpd/Makefile
+++ b/apps/netutils/ftpd/Makefile
@ -74,13 +74,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/netutils/json/Makefile
+++ b/apps/netutils/json/Makefile
@ -68,13 +68,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/netutils/resolv/Makefile
+++ b/apps/netutils/resolv/Makefile
@ -74,13 +74,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/netutils/smtp/Makefile
+++ b/apps/netutils/smtp/Makefile
@ -74,13 +74,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/netutils/telnetd/Makefile
+++ b/apps/netutils/telnetd/Makefile
@ -74,13 +74,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/netutils/tftpc/Makefile
+++ b/apps/netutils/tftpc/Makefile
@ -76,13 +76,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/netutils/thttpd/Makefile
+++ b/apps/netutils/thttpd/Makefile
@ -106,13 +106,13 @@ cgi-bin/$(SUBDIR_BIN3): cgi-bin cgi-src/$(SUBDIR_BIN3)
 endif

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/netutils/uiplib/Makefile
+++ b/apps/netutils/uiplib/Makefile
@ -90,13 +90,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/netutils/webclient/Makefile
+++ b/apps/netutils/webclient/Makefile
@ -74,13 +74,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/netutils/webserver/Makefile
+++ b/apps/netutils/webserver/Makefile
@ -81,13 +81,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/netutils/xmlrpc/Makefile
+++ b/apps/netutils/xmlrpc/Makefile
@ -76,13 +76,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/nshlib/Makefile
+++ b/apps/nshlib/Makefile
@ -110,14 +110,13 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 context:

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) \
-	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/system/free/Makefile
+++ b/apps/system/free/Makefile
@ -83,7 +83,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 # Register application
@ -97,7 +97,7 @@ context: .context
 # Create dependencies

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/system/i2c/Makefile
+++ b/apps/system/i2c/Makefile
@ -73,7 +73,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 .context:
@ -83,8 +83,7 @@ $(COBJS): %$(OBJEXT): %.c
 context: .context

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) \
-	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/system/install/Makefile
+++ b/apps/system/install/Makefile
@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 # Register application
@ -98,7 +98,7 @@ context: .context
 # Create dependencies

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/system/poweroff/Makefile
+++ b/apps/system/poweroff/Makefile
@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 # Register application
@ -98,7 +98,7 @@ context: .context
 # Create dependencies

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/system/ramtron/Makefile
+++ b/apps/system/ramtron/Makefile
@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 # Register application
@ -98,7 +98,7 @@ context: .context
 # Create dependencies

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/system/readline/Makefile
+++ b/apps/system/readline/Makefile
@ -74,7 +74,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 # Context build phase target
@ -84,7 +84,7 @@ context:
 # Dependency build phase target

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/system/sdcard/Makefile
+++ b/apps/system/sdcard/Makefile
@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 # Register application
@ -98,7 +98,7 @@ context: .context
 # Create dependencies

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/apps/system/sysinfo/Makefile
+++ b/apps/system/sysinfo/Makefile
@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)

 .built: $(OBJS)
-	$(call ARCHIVE, $@, "$(OBJS)")
+	$(call ARCHIVE, $(BIN), "$(OBJS)")
 	@touch .built

 # Register application
@ -98,7 +98,7 @@ context: .context
 # Create dependencies

 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/nuttx/Makefile
+++ b/nuttx/Makefile
@ -56,7 +56,7 @@ endif
 # This define is passed as EXTRADEFINES for kernel-mode builds.  It is also passed
 # during PASS1 (but not PASS2) context and depend targets.

-KDEFINE = ${shell $(TOPDIR)/tools/define.sh $(CC) __KERNEL__}
+KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__}

 # Process architecture and board-specific directories

--- a/nuttx/arch/8051/src/Makefile
+++ b/nuttx/arch/8051/src/Makefile
@ -171,7 +171,7 @@ board/libboard$(LIBEXT):

 pass1.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) board/libboard$(LIBEXT)
 	@echo "LD:  $@"
-	@$(CC) $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \
+	@"$(CC)" $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \
 		$(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@
 	@rm -f up_mem.h
 	@rm -f up_allocateheap$(OBJEXT) libarch$(LIBEXT)
@ -179,7 +179,7 @@ pass1.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) board/libboard$(LIBE

 nuttx.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS)
 	@echo "LD:  $@"
-	@$(CC) $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \
+	@"$(CC)" $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \
 		$(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@

 nuttx$(EXEEXT): pass1.hex nuttx.hex
@ -201,7 +201,7 @@ export_head: board/libboard$(LIBEXT) p_head$(OBJEXT)
 # a PHONY target that just sets upt the up_irqtest build correctly

 up_irqtest.hex: $(TESTOBJS)
-	$(CC) $(LDFLAGS) -L. $(SDCCPATH) $(TESTLINKOBJS) $(TESTOBJS) $(TESTEXTRAOBJS) $(SDCCLIBS) -o $@
+	"$(CC)" $(LDFLAGS) -L. $(SDCCPATH) $(TESTLINKOBJS) $(TESTOBJS) $(TESTEXTRAOBJS) $(SDCCLIBS) -o $@

 irqtest:
 	@$(MAKE) TOPDIR=../../.. up_irqtest.hex
@ -212,7 +212,7 @@ irqtest:
 	@if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR=$(TOPDIR) depend ; \
 	fi	
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/nuttx/arch/arm/src/Makefile
+++ b/nuttx/arch/arm/src/Makefile
@ -78,32 +78,32 @@ EXTRA_LIBPATHS ?=
 LINKLIBS ?=

 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
+  BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
+ifdef BOARDMAKE
+  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}"
 endif

 else
-  BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
+  BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")

 ifeq ($(WINTOOL),y)
  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
+ifdef BOARDMAKE
+  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
 endif

 else
-  LIBPATHS += -L"(TOPDIR)/lib"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"$(BOARDDIR)"
+  LIBPATHS += -L"$(TOPDIR)/lib"
+ifdef BOARDMAKE
+  LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"
 endif
 endif
 endif

 LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))

-LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
+LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}"
 GCC_LIBDIR := ${shell dirname $(LIBGCC)}

 VPATH = chip:common:$(ARCH_SUBDIR)
@ -150,24 +150,24 @@ endif
 # Dependencies

 .depend: Makefile chip/Make.defs $(SRCS)
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
 endif
 	$(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \
-	 $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	 "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	$(Q) touch $@

 depend: .depend

 clean:
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(MAKE) -C board TOPDIR="$(TOPDIR)" clean
 endif
 	$(Q) rm -f libarch$(LIBEXT) *~ .*.swp
 	$(call CLEAN)

 distclean: clean
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
 endif
 	$(Q) rm -f Make.dep .depend
--- a/nuttx/arch/avr/src/Makefile
+++ b/nuttx/arch/avr/src/Makefile
@ -79,25 +79,25 @@ EXTRA_LIBS ?=
 LINKLIBS ?=

 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
+  BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
+ifdef BOARDMAKE
+  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}"
 endif

 else
-  BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
+  BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")

 ifeq ($(WINTOOL),y)
  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
+ifdef BOARDMAKE
+  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
 endif

 else
-  LIBPATHS += -L"(TOPDIR)/lib"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"$(BOARDDIR)"
+  LIBPATHS += -L"$(TOPDIR)/lib"
+ifdef BOARDMAKE
+  LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"
 endif
 endif
 endif
@ -105,7 +105,7 @@ endif
 LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))


-LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
+LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}"

 VPATH = chip:common:$(ARCH_SUBDIR)

@ -146,24 +146,24 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
 # Dependencies

 .depend: Makefile chip/Make.defs $(SRCS)
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
 endif
 	$(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \
-	 $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	 "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	$(Q) touch $@

 depend: .depend

 clean:
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
 endif
 	$(Q) rm -f libarch$(LIBEXT) *~ .*.swp
 	$(call CLEAN)

 distclean: clean
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
 endif
 	$(Q) rm -f Make.dep .depend
--- a/nuttx/arch/hc/src/Makefile
+++ b/nuttx/arch/hc/src/Makefile
@ -72,32 +72,32 @@ EXTRA_LIBS ?=
 LINKLIBS ?=

 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
+  BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
+ifdef BOARDMAKE
+  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}"
 endif

 else
-  BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
+  BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")

 ifeq ($(WINTOOL),y)
  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
+ifdef BOARDMAKE
+  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
 endif

 else
-  LIBPATHS += -L"(TOPDIR)/lib"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"$(BOARDDIR)"
+  LIBPATHS += -L"$(TOPDIR)/lib"
+ifdef BOARDMAKE
+  LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"
 endif
 endif
 endif

 LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))

-LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
+LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}"

 VPATH = chip:common:$(ARCH_SUBDIR)

@ -137,24 +137,24 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
 # Dependencies

 .depend: Makefile chip/Make.defs $(SRCS)
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
 endif
 	$(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \
-	 $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	 "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	$(Q) touch $@

 depend: .depend

 clean:
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
 endif
 	$(Q) rm -f libarch$(LIBEXT) *~ .*.swp
 	$(call CLEAN)

 distclean: clean
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
 endif
 	$(Q) rm -f Make.dep .depend
--- a/nuttx/arch/mips/src/Makefile
+++ b/nuttx/arch/mips/src/Makefile
@ -69,32 +69,32 @@ EXTRA_LIBS ?=
 LINKLIBS ?=

 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
+  BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
+ifdef BOARDMAKE
+  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}"
 endif

 else
-  BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
+  BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")

 ifeq ($(WINTOOL),y)
  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
+ifdef BOARDMAKE
+  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
 endif

 else
-  LIBPATHS += -L"(TOPDIR)/lib"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"$(BOARDDIR)"
+  LIBPATHS += -L"$(TOPDIR)/lib"
+ifdef BOARDMAKE
+  LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"
 endif
 endif
 endif

 LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))

-LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
+LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}"

 VPATH = chip:common:$(ARCH_SUBDIR)

@ -135,24 +135,24 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
 # Dependencies

 .depend: Makefile chip/Make.defs $(SRCS)
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
 endif
 	$(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \
-	 $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	 "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	$(Q) touch $@

 depend: .depend

 clean:
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
 endif
 	$(Q) rm -f libarch$(LIBEXT) *~ .*.swp
 	$(call CLEAN)

 distclean: clean
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
 endif
 	$(Q) rm -f Make.dep .depend
--- a/nuttx/arch/rgmp/src/Makefile
+++ b/nuttx/arch/rgmp/src/Makefile
@ -55,7 +55,7 @@ LINKOBJS    = $(LINKSRCS:.c=$(OBJEXT))
 LDFLAGS		+= -T$(RGMPLKSCPT)
 LDLIBS		= $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))
 LDPATHS		+= -L"$(TOPDIR)/lib -L$(RGMPLIBDIR)
-LDLIBS		+= -lrgmp $(shell $(CC) -print-libgcc-file-name)
+LDLIBS		+= -lrgmp $(shell "$(CC)" -print-libgcc-file-name)

 all: libarch$(LIBEXT)

@ -90,7 +90,7 @@ export_head:
 # Dependencies

 .depend: Makefile $(SRCS) $(LINKSRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) $(LINKSRCS) >Make.dep
+	@$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) $(LINKSRCS) >Make.dep
 	@touch $@

 depend: .depend
--- a/nuttx/arch/sh/src/Makefile
+++ b/nuttx/arch/sh/src/Makefile
@ -55,32 +55,32 @@ EXTRA_LIBS ?=
 LINKLIBS ?=

 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
+  BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
+ifdef BOARDMAKE
+  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}"
 endif

 else
-  BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
+  BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")

 ifeq ($(WINTOOL),y)
  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
+ifdef BOARDMAKE
+  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
 endif

 else
-  LIBPATHS += -L"(TOPDIR)/lib"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"$(BOARDDIR)"
+  LIBPATHS += -L"$(TOPDIR)/lib"
+ifdef BOARDMAKE
+  LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"
 endif
 endif
 endif

 LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))

-LIBGCC = ${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}
+LIBGCC = ${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}

 VPATH = chip:common

@ -102,7 +102,7 @@ board/libboard$(LIBEXT):

 nuttx: $(HEAD_OBJ) board/libboard$(LIBEXT)
 	@echo "LD: nuttx"
-	$(Q) $(LD) --entry=__start $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) -o $(TOPDIR)/$@ $(HEAD_OBJ) \
+	$(Q) $(LD) --entry=__start $(LDFLAGS) $(LDPATHS) -L$(BOARDMAKE) -o $(TOPDIR)/$@ $(HEAD_OBJ) \
 		--start-group $(LDLIBS) -lboard $(EXTRA_LIBS) $(LIBGCC) --end-group
 	$(Q) $(NM) $(TOPDIR)/$@ | \
 	grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
@ -121,23 +121,23 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
 # Dependencies

 .depend: Makefile chip/Make.defs $(SRCS)
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
 endif
-	$(Q) $(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	$(Q) touch $@

 depend: .depend

 clean:
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
 endif
 	$(Q) rm -f libarch$(LIBEXT) *~ .*.swp
 	$(call CLEAN)

 distclean: clean
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
 endif
 	$(Q) rm -f Make.dep .depend
--- a/nuttx/arch/sim/src/Makefile
+++ b/nuttx/arch/sim/src/Makefile
@ -127,8 +127,8 @@ endif
 # Most are provided by LINKLIBS on the MAKE command line

 LINKLIBS ?=
-LIBPATHS += -L"(TOPDIR)/lib"
-LIBPATHS += -L"$(BOARDDIR)"
+LIBPATHS += -L"$(TOPDIR)/lib"
+LIBPATHS += -Lboard
 LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))

 # Add the board-specific library and directory
@ -150,7 +150,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c

 $(HOSTOBJS): %$(OBJEXT): %.c
 	$(Q) echo "CC:  $<"
-	$(Q) $(CC) -c $(HOSTCFLAGS) $< -o $@
+	$(Q) "$(CC)" -c $(HOSTCFLAGS) $< -o $@

 # The architecture-specific library

@ -186,7 +186,7 @@ nuttx.rel : libarch$(LIBEXT) board/libboard$(LIBEXT) $(HOSTOS)-names.dat $(LINKO

 nuttx$(EXEEXT): cleanrel nuttx.rel $(HOSTOBJS)
 	$(Q) echo "LD:  nuttx$(EXEEXT)"
-	$(Q) $(CC) $(CCLINKFLAGS) $(LDPATHS) -o $(TOPDIR)/$@ nuttx.rel $(HOSTOBJS) $(DRVLIB) $(STDLIBS)
+	$(Q) "$(CC)" $(CCLINKFLAGS) $(LDPATHS) -o $(TOPDIR)/$@ nuttx.rel $(HOSTOBJS) $(DRVLIB) $(STDLIBS)
 	$(Q) $(NM) $(TOPDIR)/$@ | \
 		grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
 		sort > $(TOPDIR)/System.map
@ -202,7 +202,7 @@ export_head: board/libboard$(LIBEXT) up_head.o $(HOSTOBJS)
 # Dependencies

 .depend: Makefile $(SRCS)
-	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	$(Q) touch $@

 depend: .depend
--- a/nuttx/arch/x86/src/Makefile
+++ b/nuttx/arch/x86/src/Makefile
@ -69,32 +69,32 @@ EXTRA_LIBS ?=
 LINKLIBS ?=

 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
+  BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile")
  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
+ifdef BOARDMAKE
+  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}"
 endif

 else
-  BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")
+  BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile")

 ifeq ($(WINTOOL),y)
  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}"
+ifdef BOARDMAKE
+  LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}"
 endif

 else
-  LIBPATHS += -L"(TOPDIR)/lib"
-ifneq ($(BOARDDIR),)
-  LIBPATHS += -L"$(BOARDDIR)"
+  LIBPATHS += -L"$(TOPDIR)/lib"
+ifdef BOARDMAKE
+  LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"
 endif
 endif
 endif

 LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS)))

-LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
+LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}"

 ifeq ($(HOSTOS),FreeBSD)
  HOST_ARCH = ${shell uname -m 2>/dev/null || echo "Other"}
@ -143,24 +143,24 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
 # Dependencies

 .depend: Makefile chip/Make.defs $(SRCS)
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
 endif
 	$(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \
-	 $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	 "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
 	$(Q) touch $@

 depend: .depend

 clean:
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean
 endif
 	$(Q) rm -f libarch$(LIBEXT) *~ .*.swp
 	$(call CLEAN)

 distclean: clean
-ifneq ($(BOARDDIR),)
+ifdef BOARDMAKE
 	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean
 endif
 	$(Q) rm -f Make.dep .depend
--- a/nuttx/arch/z16/src/Makefile
+++ b/nuttx/arch/z16/src/Makefile
@ -36,7 +36,7 @@
 -include $(TOPDIR)/Make.defs
 -include chip/Make.defs

-COMPILER = ${shell basename $(CC)}
+COMPILER = ${shell basename "$(CC)"}
 ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 ifeq ($(COMPILER),zneocc.exe)
 WARCHSRCDIR := ${shell cygpath -w $(ARCHSRCDIR)}
@ -65,8 +65,6 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
 DEPSRCS = $(SSRCS) $(CSRCS)
 OBJS = $(AOBJS) $(COBJS)

-BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
-
 VPATH = chip:common

 all: $(HEAD_OBJ) libarch$(LIBEXT)
@ -118,7 +116,7 @@ nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx.linkcmd
 	@if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \
 	fi
-	@$(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
+	@$(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
 	@touch $@

 # This is part of the top-level export target
--- a/nuttx/arch/z80/src/Makefile
+++ b/nuttx/arch/z80/src/Makefile
@ -42,7 +42,7 @@

 ############################################################################
 # Compiler-Dependent Make
-COMPILER	= ${shell basename $(CC)}
+COMPILER	= ${shell basename "$(CC)"}
 ifeq ($(COMPILER),sdcc)
 include Makefile.sdcc
 else
--- a/nuttx/arch/z80/src/Makefile.sdcc
+++ b/nuttx/arch/z80/src/Makefile.sdcc
@ -75,7 +75,7 @@ VPATH = chip:common:board

 # Libraries

-LIBGCC = ${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}
+LIBGCC = ${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}

 # Supports dynamic sizing of HEAP.
 #
@ -97,11 +97,11 @@ $(COBJS): %$(OBJEXT): %.c
 # This is a kludge to work around some conflicting symbols in libsdcc.lib

 $(SDCCLIBDIR)/myz80.lib: $(SDCCLIBDIR)/$(SDCCLIB)
-	@cat $(SDCCLIBDIR)/$(SDCCLIB) | \
+	$(Q) cat $(SDCCLIBDIR)/$(SDCCLIB) | \
 		grep -v alloc | grep -v free | grep -v printf | \
 		grep -v _str  | grep -v _mem | grep -v crt0\.o \
 		> myz80.lib
-	@mv -f myz80.lib $(SDCCLIBDIR)/myz80.lib
+	$(Q) mv -f myz80.lib $(SDCCLIBDIR)/myz80.lib

 # Create a header file that contains addressing information needed by the code

@ -139,7 +139,7 @@ libarch$(LIBEXT): up_mem.h asm_mem.h $(OBJS)
 # This builds the libboard library in the board/ subdirectory 

 board/libboard$(LIBEXT):
-	@$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES)
+	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES)

 # This target builds the final executable

@ -149,7 +149,7 @@ pass1.hex: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard
 	@echo "-k $(BOARDDIR)" >>pass1.lnk		# Path to board library
 	@echo "-k $(SDCCLIBDIR)" >>pass1.lnk		# Path to SDCC z80 library
 	@echo "-l libboard$(LIBEXT)" >>pass1.lnk	# Name of board library
-	@for LIB in $(LINKLIBS); do \
+	$(Q) for LIB in $(LINKLIBS); do \
 		echo "-l $(TOPDIR)/lib/$$LIB" >> pass1.lnk ;\
 	done
 	@echo "-l myz80.lib" >>pass1.lnk		# Name of SDCC z80 library
@ -170,11 +170,11 @@ endif
 	@echo "pass1.hex" >>pass1.lnk			# Path to head object
 	@echo "$(HEAD_OBJ)" >>pass1.lnk		# Path to head object
 	@echo "-e" >>pass1.lnk				# End of script
-	@$(LD) -f pass1.lnk
-	@rm -f up_mem.h asm_mem.h
-	@rm -f up_allocateheap$(OBJEXT) $(HEAD_OBJ) libarch$(LIBEXT)
-	@$(MAKE) TOPDIR="$(TOPDIR)" libarch$(LIBEXT)
-	@$(MAKE) TOPDIR="$(TOPDIR)" $(HEAD_OBJ)
+	$(Q) $(LD) -f pass1.lnk
+	$(Q) rm -f up_mem.h asm_mem.h
+	$(Q) rm -f up_allocateheap$(OBJEXT) $(HEAD_OBJ) libarch$(LIBEXT)
+	$(Q) $(MAKE) TOPDIR="$(TOPDIR)" libarch$(LIBEXT)
+	$(Q) $(MAKE) TOPDIR="$(TOPDIR)" $(HEAD_OBJ)

 nuttx.hex: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard$(LIBEXT)
 	@echo "LD: nuttx.hex"
@ -182,7 +182,7 @@ nuttx.hex: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard
 	@echo "-k $(BOARDDIR)" >>nuttx.lnk		# Path to board library
 	@echo "-k $(SDCCLIBDIR)" >>nuttx.lnk		# Path to SDCC z80 library
 	@echo "-l libboard$(LIBEXT)" >>nuttx.lnk	# Name of board library
-	@for LIB in $(LINKLIBS); do \
+	$(Q) for LIB in $(LINKLIBS); do \
 		echo "-l $(TOPDIR)/lib/$$LIB" >> nuttx.lnk ;\
 	done
 	@echo "-l myz80.lib" >>nuttx.lnk		# Name of SDCC z80 library
@ -203,22 +203,22 @@ endif
 	@echo "nuttx.hex" >>nuttx.lnk			# Path to head object
 	@echo "$(HEAD_OBJ)" >>nuttx.lnk		# Path to head object
 	@echo "-e" >>nuttx.lnk				# End of script
-	@$(LD) -f nuttx.lnk
+	$(Q) $(LD) -f nuttx.lnk

 nuttx$(EXEEXT): pass1.hex nuttx.hex
-	@rm -f pass1.*
-	@cp -f nuttx.map $(TOPDIR)/.
+	$(Q) rm -f pass1.*
+	$(Q) cp -f nuttx.map $(TOPDIR)/.
 ifeq ($(EXEEXT),.cmd)
 	sed s/:00000001FF/:00520001AD/ nuttx.hex | \
 	hex2cmd > $(TOPDIR)/nuttx.cmd
 else
-	@packihx nuttx.hex > $(TOPDIR)/nuttx$(EXEEXT)
+	$(Q) packihx nuttx.hex > $(TOPDIR)/nuttx$(EXEEXT)
 endif

 # This is part of the top-level export target

 export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
-	@if [ -d "$(EXPORT_DIR)/startup" ]; then \
+	$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
 		cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
 	 else \
 		echo "$(EXPORT_DIR)/startup does not exist"; \
@ -228,25 +228,25 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
 # Build dependencies

 .depend: Makefile up_mem.h asm_mem.h chip/Make.defs $(DEPSRCS)
-	@if [ -e board/Makefile ]; then \
+	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \
 	fi
-	@$(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
+	$(Q) touch $@

 depend: .depend

 clean:
-	@if [ -e board/Makefile ]; then \
+	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
 	fi
-	@rm -f libarch$(LIBEXT) up_mem.h asm_mem.h pass1.* nuttx.* *~ .*.swp
+	$(Q) rm -f libarch$(LIBEXT) up_mem.h asm_mem.h pass1.* nuttx.* *~ .*.swp
 	$(call CLEAN)

 distclean: clean
-	@if [ -e board/Makefile ]; then \
+	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \
 	fi
-	@rm -f Make.dep .depend
+	$(Q) rm -f Make.dep .depend

 -include Make.dep
--- a/nuttx/arch/z80/src/Makefile.zdsii
+++ b/nuttx/arch/z80/src/Makefile.zdsii
@ -41,7 +41,7 @@ USRINCLUDES	= -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common'
 INCLUDES	= $(ARCHSTDINCLUDES) $(USRINCLUDES)
 CFLAGS		= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 CPPFLAGS	+= -I$(ARCHSRCDIR) -I$(ZDSSTDINCDIR) -I$(ZDSZILOGINCDIR)
-LDFLAGS 	+= @"${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}"
+LDFLAGS 	+= "${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}"

 ############################################################################
 # Files and directories
@ -75,9 +75,9 @@ all: $(HEAD_OBJ) libarch$(LIBEXT)
 .PHONY: board/libboard$(LIBEXT)

 $(HEAD_GENSRC) $(GENSRCS) : %$(ASMEXT): %.S
-	@$(CPP) $(CPPFLAGS) $< -o $@.tmp
-	@cat $@.tmp | sed -e "s/^#/;/g" > $@
-	@rm $@.tmp
+	$(Q) $(CPP) $(CPPFLAGS) $< -o $@.tmp
+	$(Q) cat $@.tmp | sed -e "s/^#/;/g" > $@
+	$(Q) rm $@.tmp

 $(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %$(ASMEXT)
 	$(call ASSEMBLE, $<, $@)
@ -89,13 +89,13 @@ libarch$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, "$(OBJS)")

 board/libboard$(LIBEXT):
-	@$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES)
+	$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES)

 nuttx.linkcmd: $(LINKCMDTEMPLATE)
-	@cp -f $(LINKCMDTEMPLATE) nuttx.linkcmd
+	$(Q) cp -f $(LINKCMDTEMPLATE) nuttx.linkcmd
 	@echo "\"${shell cygpath -w $(TOPDIR)/nuttx}\"= \\" >>nuttx.linkcmd
 	@echo "  \"${shell cygpath -w $(ARCHSRCDIR)/$(HEAD_OBJ)}\", \\" >>nuttx.linkcmd
-	@( for lib in $(LINKLIBS); do \
+	$(Q) ( for lib in $(LINKLIBS); do \
 		echo "  \"`cygpath -w $(TOPDIR)/$${lib}`\", \\" >>nuttx.linkcmd; \
 	done ; )
 	@echo "  \"${shell cygpath -w $(ARCHSRCDIR)/board/libboard$(LIBEXT)}\", \\"  >>nuttx.linkcmd
@ -123,19 +123,19 @@ endif

 nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx.linkcmd
 	@echo "LD:  nuttx.hex"
-	@$(LD) $(LDFLAGS)
+	$(Q) $(LD) $(LDFLAGS)

 .depend: Makefile chip/Make.defs $(DEPSRCS)
-	@if [ -e board/Makefile ]; then \
+	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \
 	fi
-	@$(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
+	$(Q) touch $@

 # This is part of the top-level export target

 export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
-	@if [ -d "$(EXPORT_DIR)/startup" ]; then \
+	$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
 		cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
 	 else \
 		echo "$(EXPORT_DIR)/startup does not exist"; \
@ -147,17 +147,17 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
 depend: .depend

 clean:
-	@if [ -e board/Makefile ]; then \
+	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
 	fi
-	@rm -f libarch$(LIBEXT) *~ .*.swp
-	@rm -f nuttx.linkcmd *.asm *.tmp *.map
+	$(Q) rm -f libarch$(LIBEXT) *~ .*.swp
+	$(Q) rm -f nuttx.linkcmd *.asm *.tmp *.map
 	$(call CLEAN)

 distclean: clean
-	@if [ -e board/Makefile ]; then \
+	$(Q) if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \
 	fi
-	@rm -f Make.dep .depend
+	$(Q) rm -f Make.dep .depend

 -include Make.dep
--- a/nuttx/binfmt/Makefile
+++ b/nuttx/binfmt/Makefile
@ -81,7 +81,7 @@ $(BIN): $(BINFMT_OBJS)
 	$(call ARCHIVE, $@, "$(BINFMT_OBJS)")

 .depend: Makefile $(BINFMT_SRCS)
-	$(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(BINFMT_SRCS) >Make.dep
+	$(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(BINFMT_SRCS) >Make.dep
 	$(Q) touch $@

 depend: .depend
--- a/Show More
+++ b/Show More