Finishes all Makefile file changes for Windows native clean

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

misc/pascal/nuttx/Makefile

@@ -36,20 +36,20 @@
 PCODEDIR := ${shell pwd | sed -e 's/ /\\ /g'}
 
 -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
+include $(APPDIR)$(DELIM)Make.defs
 
 # Default tools
 
 ifeq ($(DIRLINK),)
-DIRLINK = $(TOPDIR)/tools/link.sh
-DIRUNLINK = $(TOPDIR)/tools/unlink.sh
+DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)link.sh
+DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
 endif
 
 ifeq ($(WINTOOL),y)
 INCDIROPT = -w
 endif
 
-USRINCLUDES = ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(PCODEDIR)/include $(PCODEDIR)/insn/include}
+USRINCLUDES = ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(PCODEDIR)$(DELIM)include $(PCODEDIR)$(DELIM)insn$(DELIM)include}
 
 COMPILER = ${shell basename $(CC)}
 ifeq ($(COMPILER),zneocc.exe)
@@ -60,9 +60,9 @@ endif
 
 CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES)
 
-include insn/prun/Make.defs
-include libpoff/Make.defs
-include libpas/Make.defs
+include insn$(DELIM)prun$(DELIM)Make.defs
+include libpoff$(DELIM)Make.defs
+include libpas$(DELIM)Make.defs
 
 ASRCS = $(PRUN_ASRCS) $(POFF_ASRCS) $(PAS_ASRCS)
 AOBJS = $(ASRCS:.S=$(OBJEXT))
@@ -74,17 +74,17 @@ SRCS = $(ASRCS) $(CSRCS)
 OBJS = $(AOBJS) $(COBJS)
 
 ifeq ($(WINTOOL),y)
-  BIN		= "${shell cygpath -w  $(APPDIR)/libapps$(LIBEXT)}"
+  BIN		= "${shell cygpath -w  $(APPDIR)$(DELIM)libapps$(LIBEXT)}"
 else
-  BIN		= "$(APPDIR)/libapps$(LIBEXT)"
+  BIN		= "$(APPDIR)$(DELIM)libapps$(LIBEXT)"
 endif
 
 ROOTDEPPATH	= --dep-path .
-PRUNDEPPATH	= --dep-path insn/prun
+PRUNDEPPATH	= --dep-path insn$(DELIM)prun
 POFFDEPPATH = --dep-path libpoff
 PASDEPPATH  = --dep-path libpas
 
-VPATH = insn/prun:libpoff:libpas
+VPATH = insn$(DELIM)prun:libpoff:libpas
 
 all: .built
 .PHONY: context depend clean distclean
@@ -103,17 +103,17 @@ else
 	$(call COMPILE, $<, $@)
 endif
 
-$(APPDIR)/include/pcode: include
-	@$(DIRLINK) $(PCODEDIR)/include $(APPDIR)/include/pcode
+$(APPDIR)$(DELIM)include$(DELIM)pcode: include
+	@$(DIRLINK) $(PCODEDIR)$(DELIM)include $(APPDIR)$(DELIM)include$(DELIM)pcode
 
-$(APPDIR)/include/pcode/insn: $(APPDIR)/include/pcode insn/include
-	@$(DIRLINK) $(PCODEDIR)/insn/include $(APPDIR)/include/pcode/insn
+$(APPDIR)$(DELIM)include$(DELIM)pcode$(DELIM)insn: $(APPDIR)$(DELIM)include$(DELIM)pcode insn$(DELIM)include
+	@$(DIRLINK) $(PCODEDIR)$(DELIM)insn$(DELIM)include $(APPDIR)$(DELIM)include$(DELIM)pcode$(DELIM)insn
 
-.built: $(APPDIR)/include/pcode $(APPDIR)/include/pcode/insn $(OBJS)
+.built: $(APPDIR)$(DELIM)include$(DELIM)pcode $(APPDIR)$(DELIM)include$(DELIM)pcode$(DELIM)insn $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 	@touch .built
 
-context: $(APPDIR)/include/pcode $(APPDIR)/include/pcode/insn
+context: $(APPDIR)$(DELIM)include$(DELIM)pcode $(APPDIR)$(DELIM)include$(DELIM)pcode$(DELIM)insn
 
 .depend: Makefile $(SRCS)
 	@$(MKDEP) $(ROOTDEPPATH) $(PRUNDEPPATH) $(POFFDEPPATH) $(PASDEPPATH) \
@@ -123,12 +123,13 @@ context: $(APPDIR)/include/pcode $(APPDIR)/include/pcode/insn
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
-	@$(DIRUNLINK) $(APPDIR)/include/pcode/insn
-	@$(DIRUNLINK) $(APPDIR)/include/pcode
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
+	@$(DIRUNLINK) $(APPDIR)$(DELIM)include$(DELIM)pcode$(DELIM)insn
+	@$(DIRUNLINK) $(APPDIR)$(DELIM)include$(DELIM)pcode
 
 -include Make.dep

nuttx/configs/amber/src/Makefile

@@ -80,16 +80,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/avr32dev1/src/Makefile

@@ -73,17 +73,18 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
 

nuttx/configs/c5471evm/src/Makefile

@@ -60,16 +60,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/compal_e88/src/Makefile

@@ -63,16 +63,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/compal_e99/src/Makefile

@@ -63,16 +63,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/demo9s12ne64/src/Makefile

@@ -69,16 +69,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/ea3131/locked/Makefile

@@ -33,22 +33,21 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
 # Board-specific directory, board library, and application library
 
-PASS1_SRCDIR = arch/$(CONFIG_ARCH)/src
-PASS1_BOARDDIR = $(PASS1_SRCDIR)/board
-PASS1_LIBBOARD = $(PASS1_BOARDDIR)/libboard$(LIBEXT)
+PASS1_SRCDIR = arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
+PASS1_BOARDDIR = $(PASS1_SRCDIR)$(DELIM)board
+PASS1_LIBBOARD = $(PASS1_BOARDDIR)$(DELIM)libboard$(LIBEXT)
 
 # Where is the application library?
 
 ifneq ($(CONFIG_APPS_DIR),)
-PASS1_LIBAPPS = $(CONFIG_APPS_DIR)/libapps$(LIBEXT)
+PASS1_LIBAPPS = $(CONFIG_APPS_DIR)$(DELIM)libapps$(LIBEXT)
 else
 ifneq ($(APPDIR),)
-PASS1_LIBAPPS = $(APPDIR)/libapps$(LIBEXT)
+PASS1_LIBAPPS = $(APPDIR)$(DELIM)libapps$(LIBEXT)
 endif
 endif
 
@@ -63,12 +62,12 @@ PASS1_LINKLIBS += $(PASS1_LIBBOARD)
 
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains
-  PASS1_LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}"
-  PASS1_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/locked/ld-locked.inc}"
+  PASS1_LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)$(DELIM)lib"}"
+  PASS1_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)locked$(DELIM)ld-locked.inc}"
 else
   # Linux/Cygwin-native toolchain 
-  PASS1_LIBPATHS += -L"(TOPDIR)/lib"
-  PASS1_LDSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/locked/ld-locked.inc
+  PASS1_LIBPATHS += -L"(TOPDIR)$(DELIM)lib"
+  PASS1_LDSCRIPT = -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)locked$(DELIM)ld-locked.inc
 endif
 
 PASS1_LDFLAGS = -r $(PASS1_LDSCRIPT)
@@ -77,23 +76,23 @@ PASS1_LIBGCC = "${shell $(CC) -print-libgcc-file-name}"
 
 # Targets:
 
-all: $(PASS1_SRCDIR)/locked.r
+all: $(PASS1_SRCDIR)$(DELIM)locked.r
 
 .PHONY:	depend clean distclean
 
 # Create include-able linker script that specifies all of the symbols to be
 # resolved in the locked.r file.
 
-ld-locked.inc: mklocked.sh $(TOPDIR)/.config
+ld-locked.inc: mklocked.sh $(TOPDIR)$(DELIM).config
 	@echo "MK:  ld-locked.inc"
-	@./mklocked.sh "$(TOPDIR)"
+	@.$(DELIM)mklocked.sh "$(TOPDIR)"
 
 # Make the board library. This is normally done in arch/arm/src/Makefile.
 # However, we need it earlier here when doing a two-pass build so that libboard.a
 # is available to link against.
 
 $(PASS1_LIBBOARD):
-	@$(MAKE) -C $(TOPDIR)/configs/ea3131/src TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES)
+	@$(MAKE) -C $(TOPDIR)$(DELIM)configs$(DELIM)ea3131$(DELIM)src TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES)
 
 # Create the locked.r file containing all of the code (except the start-up code)
 # that needs to lie in the locked text region.
@@ -105,16 +104,17 @@ locked.r: ld-locked.inc $(PASS1_LIBBOARD)
 	@fgrep " U " locked.map | grep -v os_start
 	@$(CROSSDEV)size $@
 
-$(PASS1_SRCDIR)/locked.r: locked.r
-	@cp -a locked.r $(TOPDIR)/$(PASS1_SRCDIR)/locked.r
+$(PASS1_SRCDIR)$(DELIM)locked.r: locked.r
+	@cp -a locked.r $(TOPDIR)$(DELIM)$(PASS1_SRCDIR)$(DELIM)locked.r
 
 .depend:
 
 depend: .depend
 
 clean:
-	@rm -f locked.r locked.map *~ .*.swp
+	$(call DELFILE locked.r)
+	$(call DELFILE locked.map)
+	$(call CLEAN)
 
 distclean: clean
-	@rm -f ld-locked.inc
-
+	$(call DELFILE ld-locked.inc)

nuttx/configs/ea3131/src/Makefile

@@ -88,16 +88,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/ea3152/src/Makefile

@@ -88,16 +88,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/eagle100/src/Makefile

@@ -69,16 +69,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/ekk-lm3s9b96/src/Makefile

@@ -71,16 +71,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/ez80f910200kitg/src/Makefile

@@ -53,9 +53,9 @@ OBJS		= $(AOBJS) $(COBJS)
 all: libboard$(LIBEXT)
 
 $(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S
-	@$(CPP) $(CPPFLAGS) `cygpath -w $<` -o $@.tmp
-	@cat $@.tmp | sed -e "s/^#/;/g" > $@
-	@rm $@.tmp
+	$(Q) $(CPP) $(CPPFLAGS) `cygpath -w $<` -o $@.tmp
+	$(Q) cat $@.tmp | sed -e "s/^#/;/g" > $@
+	$(Q) rm $@.tmp
 
 $(AOBJS): %$(OBJEXT): %$(ASMEXT)
 	$(call ASSEMBLE, $<, $@)
@@ -67,16 +67,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/ez80f910200zco/src/Makefile

@@ -60,9 +60,9 @@ OBJS		= $(AOBJS) $(COBJS)
 all: libboard$(LIBEXT)
 
 $(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S
-	@$(CPP) $(CPPFLAGS) `cygpath -w $<` -o $@.tmp
-	@cat $@.tmp | sed -e "s/^#/;/g" > $@
-	@rm $@.tmp
+	$(Q) $(CPP) $(CPPFLAGS) `cygpath -w $<` -o $@.tmp
+	$(Q) cat $@.tmp | sed -e "s/^#/;/g" > $@
+	$(Q) rm $@.tmp
 
 $(AOBJS): %$(OBJEXT): %$(ASMEXT)
 	$(call ASSEMBLE, $<, $@)
@@ -74,16 +74,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/fire-stm32v2/src/Makefile

@@ -110,16 +110,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/hymini-stm32v/src/Makefile

@@ -89,16 +89,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/kwikstik-k40/src/Makefile

@@ -88,16 +88,16 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
-
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/lincoln60/src/Makefile

@@ -79,16 +79,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/lm3s6432-s2e/src/Makefile

@@ -70,16 +70,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/lm3s6965-ek/src/Makefile

@@ -73,16 +73,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/lm3s8962-ek/src/Makefile

@@ -73,16 +73,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/lpc4330-xplorer/src/Makefile

@@ -107,16 +107,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/lpcxpresso-lpc1768/src/Makefile

@@ -79,16 +79,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/m68332evb/src/Makefile

@@ -57,16 +57,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/mbed/src/Makefile

@@ -73,16 +73,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/mcu123-lpc214x/src/Makefile

@@ -80,16 +80,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/micropendous3/src/Makefile

@@ -80,16 +80,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/mirtoo/src/Makefile

@@ -79,16 +79,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/mx1ads/src/Makefile

@@ -60,16 +60,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep

nuttx/configs/ne64badge/src/Makefile

@@ -69,16 +69,17 @@ libboard$(LIBEXT): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
-	@touch $@
+	$(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
 
 depend: .depend
 
 clean:
-	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call DELFILE libboard$(LIBEXT)))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep