Finishes all Makefile file changes for Windows native clean

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5368 42af7a65-404d-4744-a932-0658087f49c3

20 files changed, 331 insertions, 311 deletions

diff --git a/NxWidgets/UnitTests/CButton/Makefile b/NxWidgets/UnitTests/CButton/Makefile
index c2dcfcb5d..778d46513 100644
--- a/NxWidgets/UnitTests/CButton/Makefile
+++ b/NxWidgets/UnitTests/CButton/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,21 +148,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/CButtonArray/Makefile b/NxWidgets/UnitTests/CButtonArray/Makefile
index 8df0b4213..39af8ff3a 100644
--- a/NxWidgets/UnitTests/CButtonArray/Makefile
+++ b/NxWidgets/UnitTests/CButtonArray/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,21 +148,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/CCheckBox/Makefile b/NxWidgets/UnitTests/CCheckBox/Makefile
index e363aed44..583817857 100644
--- a/NxWidgets/UnitTests/CCheckBox/Makefile
+++ b/NxWidgets/UnitTests/CCheckBox/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,21 +148,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/CGlyphButton/Makefile b/NxWidgets/UnitTests/CGlyphButton/Makefile
index 9b529faee..e61f960d1 100644
--- a/NxWidgets/UnitTests/CGlyphButton/Makefile
+++ b/NxWidgets/UnitTests/CGlyphButton/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,21 +148,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/CImage/Makefile b/NxWidgets/UnitTests/CImage/Makefile
index b35fb2f7c..88e786505 100644
--- a/NxWidgets/UnitTests/CImage/Makefile
+++ b/NxWidgets/UnitTests/CImage/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,21 +148,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/CKeypad/Makefile b/NxWidgets/UnitTests/CKeypad/Makefile
index 2003e13f9..873b7a695 100644
--- a/NxWidgets/UnitTests/CKeypad/Makefile
+++ b/NxWidgets/UnitTests/CKeypad/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,21 +148,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/CLabel/Makefile b/NxWidgets/UnitTests/CLabel/Makefile
index dacfa6274..5122558ff 100644
--- a/NxWidgets/UnitTests/CLabel/Makefile
+++ b/NxWidgets/UnitTests/CLabel/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,21 +148,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/CLatchButton/Makefile b/NxWidgets/UnitTests/CLatchButton/Makefile
index 6730a6eb5..d38872079 100644
--- a/NxWidgets/UnitTests/CLatchButton/Makefile
+++ b/NxWidgets/UnitTests/CLatchButton/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,21 +148,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/CLatchButtonArray/Makefile b/NxWidgets/UnitTests/CLatchButtonArray/Makefile
index 715ab3e2a..94a2bc49e 100644
--- a/NxWidgets/UnitTests/CLatchButtonArray/Makefile
+++ b/NxWidgets/UnitTests/CLatchButtonArray/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,21 +148,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/CListBox/Makefile b/NxWidgets/UnitTests/CListBox/Makefile
index 52f3ca038..ca9055870 100644
--- a/NxWidgets/UnitTests/CListBox/Makefile
+++ b/NxWidgets/UnitTests/CListBox/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,21 +148,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/CProgressBar/Makefile b/NxWidgets/UnitTests/CProgressBar/Makefile
index 49eddf188..b9c498df9 100644
--- a/NxWidgets/UnitTests/CProgressBar/Makefile
+++ b/NxWidgets/UnitTests/CProgressBar/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,21 +148,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/CRadioButton/Makefile b/NxWidgets/UnitTests/CRadioButton/Makefile
index 17b58a7c9..0a96580e0 100644
--- a/NxWidgets/UnitTests/CRadioButton/Makefile
+++ b/NxWidgets/UnitTests/CRadioButton/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,21 +148,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile b/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile
index 9efc5d401..0fe12318b 100644
--- a/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile
+++ b/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,7 +148,7 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
@@ -159,10 +159,11 @@ context: .context
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/CScrollbarVertical/Makefile b/NxWidgets/UnitTests/CScrollbarVertical/Makefile
index 3f6926628..60fb0b545 100644
--- a/NxWidgets/UnitTests/CScrollbarVertical/Makefile
+++ b/NxWidgets/UnitTests/CScrollbarVertical/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,21 +148,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/CSliderHorizonal/Makefile b/NxWidgets/UnitTests/CSliderHorizonal/Makefile
index 97be73810..5675c55bf 100644
--- a/NxWidgets/UnitTests/CSliderHorizonal/Makefile
+++ b/NxWidgets/UnitTests/CSliderHorizonal/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,21 +148,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/CSliderVertical/Makefile b/NxWidgets/UnitTests/CSliderVertical/Makefile
index 1c3791393..78dc6dc8d 100644
--- a/NxWidgets/UnitTests/CSliderVertical/Makefile
+++ b/NxWidgets/UnitTests/CSliderVertical/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,21 +148,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/CTextBox/Makefile b/NxWidgets/UnitTests/CTextBox/Makefile
index 8a44caee2..c913b50a4 100644
--- a/NxWidgets/UnitTests/CTextBox/Makefile
+++ b/NxWidgets/UnitTests/CTextBox/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,8 +54,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # Hello, World! C++ Example
 
@@ -70,7 +70,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -120,7 +120,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklib:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy.  chklib does the work.
 .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -148,21 +148,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/UnitTests/nxwm/Makefile b/NxWidgets/UnitTests/nxwm/Makefile
index 3dd666b11..205caf879 100644
--- a/NxWidgets/UnitTests/nxwm/Makefile
+++ b/NxWidgets/UnitTests/nxwm/Makefile
@@ -36,13 +36,13 @@
 TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Add the path to the NXWidget include directory to the CFLAGS
 
-NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets"
-NXWIDGETS_INC="$(NXWIDGETS_DIR)/include"
-NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)"
+NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets"
+NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include"
+NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"}
@@ -54,9 +54,9 @@ endif
 
 # Add the path to the NxWM include directory to the CFLAGS
 
-NXWM_DIR="$(TESTDIR)/../../nxwm"
-NXWM_INC="$(NXWM_DIR)/include"
-NXWM_LIB="$(NXWM_DIR)/libnxwm$(LIBEXT)"
+NXWM_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)nxwm"
+NXWM_INC="$(NXWM_DIR)$(DELIM)include"
+NXWM_LIB="$(NXWM_DIR)$(DELIM)libnxwm$(LIBEXT)"
 
 ifeq ($(WINTOOL),y)
   CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWM_INC)"}
@@ -68,8 +68,8 @@ endif
 
 # Get the path to the archiver tool
 
-TESTTOOL_DIR="$(TESTDIR)/../../tools"
-ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
+TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools"
+ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh
 
 # NxWM unit test
 
@@ -84,7 +84,7 @@ CXXOBJS		= $(CXXSRCS:.cxx=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS) $(CXXSRCS)
 OBJS		= $(AOBJS) $(COBJS) $(CXXOBJS)
 
-POSIX_BIN	= "$(APPDIR)/libapps$(LIBEXT)"
+POSIX_BIN	= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 ifeq ($(WINTOOL),y)
   BIN		= "${shell cygpath -w  $(POSIX_BIN)}"
 else
@@ -134,7 +134,7 @@ endif
 # Verify that the NXWidget library has been built
 
 chklibnxwidgets:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWIDGETS_LIB)" ]; then \
 			echo "$(NXWIDGETS_LIB) does not exist."; \
 			echo "Please go to $(NXWIDGETS_DIR)"; \
@@ -146,7 +146,7 @@ chklibnxwidgets:
 # Verify that the NxWM library has been built
 
 chklibnxwm:
-	@( \
+	$(Q) ( \
 		if [ ! -e "$(NXWM_LIB)" ]; then \
 			echo "$(NXWM_LIB) does not exist."; \
 			echo "Please go to $(NXWM_LIB)"; \
@@ -164,13 +164,13 @@ $(NXWM_LIB): # Just to keep make happy.  chklibnxwm does the work.
 .built: $(OBJS) $(NXWIDGETS_LIB)
 	$(call ARCHIVE, $@, $(OBJS))
 ifeq ($(WINTOOL),y)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
-	@$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWM_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWM_DIR)
 else
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
-	@$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWM_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR)
+	$(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWM_DIR)
 endif
-	@touch .built
+	$(Q) touch .built
 
 # Standard housekeeping targets
 
@@ -178,21 +178,22 @@ endif
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 endif
-	@touch $@
+	$(Q) touch $@
 
 context: .context
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/NxWidgets/libnxwidgets/Makefile b/NxWidgets/libnxwidgets/Makefile
index 654f1d2fc..27a85b428 100644
--- a/NxWidgets/libnxwidgets/Makefile
+++ b/NxWidgets/libnxwidgets/Makefile
@@ -87,8 +87,8 @@ ifeq ($(WINTOOL),y)
 INCDIROPT = -w
 endif
 
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)/include}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)/include}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)$(DELIM)include}
+CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)$(DELIM)include}
 DEPPATH = --dep-path src
 VPATH = src
 
@@ -105,7 +105,7 @@ $(CXXOBJS): %$(OBJEXT): %.cxx
 	$(call COMPILEXX, $<, $@)
 
 check_nuttx:
-	@( \
+	$(Q) ( \
 		if [ -z "$(TOPDIR)" ]; then \
 			echo "The path to the nuttx directory must be provided on the command line."; \
 			echo "Usage: make -C $(NXWIDGETDIR) TOPDIR=\"<nuttx directory>\""; \
@@ -115,7 +115,7 @@ check_nuttx:
 			echo "The nuttx directory (TOPDIR) does not exist: $(TOPDIR)"; \
 			exit 1; \
 		fi; \
-		if [ ! -f "$(TOPDIR)/.config" ]; then \
+		if [ ! -f "$(TOPDIR)$(DELIM).config" ]; then \
 			echo "The nuttx directory (TOPDIR) has not been configured"; \
 			echo "Please configure NuttX and try again"; \
 			exit 1; \
@@ -126,17 +126,18 @@ $(BIN): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f $(BIN) *.a *.o *~ .*.sw*
+	$(call DELFILE $(BIN))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 export: $(BIN)
 	zip -r  nxwidgets-export.zip include $(BIN) COPYING
diff --git a/NxWidgets/nxwm/Makefile b/NxWidgets/nxwm/Makefile
index d272a8384..b176ce4f7 100644
--- a/NxWidgets/nxwm/Makefile
+++ b/NxWidgets/nxwm/Makefile
@@ -44,7 +44,7 @@ export Q := @
 endif
 
 NXWMDIR := ${shell pwd | sed -e 's/ /\\ /g'}
-NXWIDGETDIR := $(NXWMDIR)/../libnxwidgets
+NXWIDGETDIR := $(NXWMDIR)$(DELIM)..$(DELIM)libnxwidgets
 
 ASRCS =
 CSRCS =
@@ -88,10 +88,10 @@ ifeq ($(WINTOOL),y)
 INCDIROPT = -w
 endif
 
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWMDIR)/include}
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)/include}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWMDIR)/include}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)/include}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWMDIR)$(DELIM)include}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)$(DELIM)include}
+CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWMDIR)$(DELIM)include}
+CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)$(DELIM)include}
 
 DEPPATH = --dep-path src
 VPATH = src
@@ -109,7 +109,7 @@ $(CXXOBJS): %$(OBJEXT): %.cxx
 	$(call COMPILEXX, $<, $@)
 
 check_nuttx:
-	@( \
+	$(Q) ( \
 		if [ -z "$(TOPDIR)" ]; then \
 			echo "The path to the nuttx directory must be provided on the command line."; \
 			echo "Usage: make -C $(NXWMDIR) TOPDIR=\"<nuttx directory>\""; \
@@ -119,7 +119,7 @@ check_nuttx:
 			echo "The nuttx directory (TOPDIR) does not exist: $(TOPDIR)"; \
 			exit 1; \
 		fi; \
-		if [ ! -f "$(TOPDIR)/.config" ]; then \
+		if [ ! -f "$(TOPDIR)$(DELIM).config" ]; then \
 			echo "The nuttx directory (TOPDIR) has not been configured"; \
 			echo "Please configure NuttX and try again"; \
 			exit 1; \
@@ -130,17 +130,18 @@ $(BIN): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f $(BIN) *.a *.o *~ .*.sw*
+	$(call DELFILE $(BIN))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 export: $(BIN)
 	zip -r  nxwm-export.zip include $(BIN) COPYING