Most of the changes needed to support Windows native clean; distclean is has a problem

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

81 files changed, 428 insertions, 316 deletions

diff --git a/apps/examples/adc/Makefile b/apps/examples/adc/Makefile
index 8f37169c5..e9f3980b1 100644
--- a/apps/examples/adc/Makefile
+++ b/apps/examples/adc/Makefile
@@ -98,10 +98,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/apps/examples/buttons/Makefile b/apps/examples/buttons/Makefile
index 1f209b760..01d0719a9 100644
--- a/apps/examples/buttons/Makefile
+++ b/apps/examples/buttons/Makefile
@@ -98,10 +98,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/apps/examples/can/Makefile b/apps/examples/can/Makefile
index 20fb173f0..824cea360 100644
--- a/apps/examples/can/Makefile
+++ b/apps/examples/can/Makefile
@@ -98,10 +98,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/apps/examples/cdcacm/Makefile b/apps/examples/cdcacm/Makefile
index 1ebbc6e1e..336f57244 100644
--- a/apps/examples/cdcacm/Makefile
+++ b/apps/examples/cdcacm/Makefile
@@ -101,11 +101,12 @@ 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/apps/examples/composite/Makefile b/apps/examples/composite/Makefile
index 6fe34a1e9..da528b54b 100644
--- a/apps/examples/composite/Makefile
+++ b/apps/examples/composite/Makefile
@@ -103,11 +103,12 @@ 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/apps/examples/cxxtest/Makefile b/apps/examples/cxxtest/Makefile
index b0f0befbf..f1ab33744 100644
--- a/apps/examples/cxxtest/Makefile
+++ b/apps/examples/cxxtest/Makefile
@@ -115,10 +115,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/apps/examples/dhcpd/Makefile b/apps/examples/dhcpd/Makefile
index 6a96281cf..34575f802 100644
--- a/apps/examples/dhcpd/Makefile
+++ b/apps/examples/dhcpd/Makefile
@@ -98,11 +98,12 @@ 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/apps/examples/discover/Makefile b/apps/examples/discover/Makefile
index 722ad3d9b..6fa70d092 100644
--- a/apps/examples/discover/Makefile
+++ b/apps/examples/discover/Makefile
@@ -99,10 +99,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/apps/examples/elf/Makefile b/apps/examples/elf/Makefile
index 8831a9336..ee3413031 100644
--- a/apps/examples/elf/Makefile
+++ b/apps/examples/elf/Makefile
@@ -100,10 +100,11 @@ clean_tests:
 	@$(MAKE) -C tests TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) clean
 
 clean: clean_tests
-	@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/apps/examples/elf/tests/errno/Makefile b/apps/examples/elf/tests/errno/Makefile
index 09d469f9b..08bffc7dd 100644
--- a/apps/examples/elf/tests/errno/Makefile
+++ b/apps/examples/elf/tests/errno/Makefile
@@ -33,7 +33,6 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
 BIN = errno
@@ -45,16 +44,17 @@ all: $(BIN)
 
 $(OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CELFFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
 
 $(BIN): $(OBJS)
 	@echo "LD: $<"
-	@$(LD) $(LDELFFLAGS) -o $@ $^
+	$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
 
-clean: 
-	@rm -f $(BIN) *.o *~ .*.swp core
+clean:
+	$(call DELFILE $(BIN))
+	$(call CLEAN)
 
 install:
-	@mkdir -p $(ROMFS_DIR)
-	@install $(BIN) $(ROMFS_DIR)/$(BIN)
+	$(Q) mkdir -p $(ROMFS_DIR)
+	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)
 
diff --git a/apps/examples/elf/tests/hello/Makefile b/apps/examples/elf/tests/hello/Makefile
index 88770276b..d4af19e02 100644
--- a/apps/examples/elf/tests/hello/Makefile
+++ b/apps/examples/elf/tests/hello/Makefile
@@ -33,7 +33,6 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
 BIN = hello
@@ -45,15 +44,16 @@ all: $(BIN)
 
 $(OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CELFFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
 
 $(BIN): $(OBJS)
 	@echo "LD: $<"
-	@$(LD) $(LDELFFLAGS) -o $@ $^
+	$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) *.o *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call CLEAN)
 
 install:
-	@mkdir -p $(ROMFS_DIR)
-	@install $(BIN) $(ROMFS_DIR)/$(BIN)
+	$(Q) mkdir -p $(ROMFS_DIR)
+	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)
diff --git a/apps/examples/elf/tests/helloxx/Makefile b/apps/examples/elf/tests/helloxx/Makefile
index 45b4b8868..e1c9cfc5b 100644
--- a/apps/examples/elf/tests/helloxx/Makefile
+++ b/apps/examples/elf/tests/helloxx/Makefile
@@ -33,7 +33,6 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
 BIN1 = hello++1
@@ -68,13 +67,13 @@ all: $(BIN1) $(BIN2) $(BIN3) $(BIN4)
 
 $(OBJS): %.o: %.cpp
 	@echo "CC: $<"
-	@$(CXX) -c $(CXXELFFLAGS) $< -o $@
+	$(Q) $(CXX) -c $(CXXELFFLAGS) $< -o $@
 
 # This contains libstdc++ stubs to that you can build C++ code
 # without actually having libstdc++
 
 $(LIBSTDC_STUBS_LIB):
-	@$(MAKE) -C $(LIBSTDC_STUBS_DIR) TOPDIR=$(TOPDIR)
+	$(Q) $(MAKE) -C $(LIBSTDC_STUBS_DIR) TOPDIR=$(TOPDIR)
 
 # BIN1 and BIN2 link just like C code because they contain no
 # static constructors.  BIN1 is equivalent to a C hello world;
@@ -83,18 +82,18 @@ $(LIBSTDC_STUBS_LIB):
 
 $(BIN1): $(OBJS1)
 	@echo "LD: $<"
-	@$(LD) $(LDELFFLAGS) -o $@ $^
+	$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
 
 $(BIN2): $(OBJS2)
 	@echo "LD: $<"
-	@$(LD) $(LDELFFLAGS) -o $@ $^
+	$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
 
 # BIN3 is equivalent to BIN2 except that is uses static initializers
 
 ifeq ($(CONFIG_BINFMT_CONSTRUCTORS),y)
 $(BIN3): $(OBJS3)
 	@echo "LD: $<"
-	@$(LD) $(LDELFFLAGS) -o $@ $^
+	$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
 endif
 
 # BIN4 is similar to BIN3 except that it uses the streams code from libstdc++
@@ -103,19 +102,23 @@ endif
 #
 #$(BIN4): $(OBJS4)
 #	@echo "LD: $<"
-#	@$(LD) $(LDELFFLAGS) -o $@ $^
+#	$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(ALL_BIN) *.o *~ .*.swp core
+	$(call DELFILE $(BIN1))
+	$(call DELFILE $(BIN2))
+	$(call DELFILE $(BIN3))
+	$(call DELFILE $(BIN4))
+	$(call CLEAN)
 
 install: $(ALL_BIN)
-	@mkdir -p $(ROMFS_DIR)
-	@install $(BIN1) $(ROMFS_DIR)/$(BIN1)
-	@install $(BIN2) $(ROMFS_DIR)/$(BIN2)
+	$(Q) mkdir -p $(ROMFS_DIR)
+	$(Q) install $(BIN1) $(ROMFS_DIR)/$(BIN1)
+	$(Q) install $(BIN2) $(ROMFS_DIR)/$(BIN2)
 ifeq ($(CONFIG_BINFMT_CONSTRUCTORS),y)
-	@install $(BIN3) $(ROMFS_DIR)/$(BIN3)
+	$(Q) install $(BIN3) $(ROMFS_DIR)/$(BIN3)
 endif
-#	@install $(BIN4) $(ROMFS_DIR)/$(BIN4)
+#	$(Q) install $(BIN4) $(ROMFS_DIR)/$(BIN4)
 
 
 
diff --git a/apps/examples/elf/tests/longjmp/Makefile b/apps/examples/elf/tests/longjmp/Makefile
index 04da6ee81..e7a54fc00 100644
--- a/apps/examples/elf/tests/longjmp/Makefile
+++ b/apps/examples/elf/tests/longjmp/Makefile
@@ -33,7 +33,6 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
 BIN = longjmp
@@ -45,15 +44,16 @@ all: $(BIN)
 
 $(OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CELFFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
 
 $(BIN): $(OBJS)
 	@echo "LD: $<"
-	@$(LD) $(LDELFFLAGS) -o $@ $^
+	$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) *.o *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call CLEAN)
 
 install:
-	@mkdir -p $(ROMFS_DIR)
-	@install $(BIN) $(ROMFS_DIR)/$(BIN)
+	$(Q) mkdir -p $(ROMFS_DIR)
+	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)
diff --git a/apps/examples/elf/tests/mutex/Makefile b/apps/examples/elf/tests/mutex/Makefile
index 756ada2c0..958c0c38e 100644
--- a/apps/examples/elf/tests/mutex/Makefile
+++ b/apps/examples/elf/tests/mutex/Makefile
@@ -33,7 +33,6 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
 BIN = mutex
@@ -45,15 +44,16 @@ all: $(BIN)
 
 $(OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CELFFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
 
 $(BIN): $(OBJS)
 	@echo "LD: $<"
-	@$(LD) $(LDELFFLAGS) -o $@ $^
+	$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) *.o *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call CLEAN)
 
 install:
-	@mkdir -p $(ROMFS_DIR)
-	@install $(BIN) $(ROMFS_DIR)/$(BIN)
+	$(Q) mkdir -p $(ROMFS_DIR)
+	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)
diff --git a/apps/examples/elf/tests/pthread/Makefile b/apps/examples/elf/tests/pthread/Makefile
index 4bea4515b..a491b9874 100644
--- a/apps/examples/elf/tests/pthread/Makefile
+++ b/apps/examples/elf/tests/pthread/Makefile
@@ -33,7 +33,6 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
 BIN = pthread
@@ -45,15 +44,16 @@ all: $(BIN)
 
 $(OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CELFFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
 
 $(BIN): $(OBJS)
 	@echo "LD: $<"
-	@$(LD) $(LDELFFLAGS) -o $@ $^
+	$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) *.o *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call CLEAN)
 
 install:
-	@mkdir -p $(ROMFS_DIR)
-	@install $(BIN) $(ROMFS_DIR)/$(BIN)
+	$(Q) mkdir -p $(ROMFS_DIR)
+	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)
diff --git a/apps/examples/elf/tests/signal/Makefile b/apps/examples/elf/tests/signal/Makefile
index 9eaaf8609..227f99521 100644
--- a/apps/examples/elf/tests/signal/Makefile
+++ b/apps/examples/elf/tests/signal/Makefile
@@ -33,7 +33,6 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
 BIN = signal
@@ -45,15 +44,16 @@ all: $(BIN)
 
 $(OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CELFFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
 
 $(BIN): $(OBJS)
 	@echo "LD: $<"
-	@$(LD) $(LDELFFLAGS) -o $@ $^
+	$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) *.o *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call CLEAN)
 
 install:
-	@mkdir -p $(ROMFS_DIR)
-	@install $(BIN) $(ROMFS_DIR)/$(BIN)
+	$(Q) mkdir -p $(ROMFS_DIR)
+	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)
diff --git a/apps/examples/elf/tests/struct/Makefile b/apps/examples/elf/tests/struct/Makefile
index 2ddd80b89..3224c655e 100644
--- a/apps/examples/elf/tests/struct/Makefile
+++ b/apps/examples/elf/tests/struct/Makefile
@@ -33,7 +33,6 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
 CELFFLAGS += -I.
@@ -46,15 +45,16 @@ all: $(BIN)
 
 $(OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CELFFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
 
 $(BIN): $(OBJS)
 	@echo "LD: $<"
-	@$(LD) $(LDELFFLAGS) -o $@ $^
+	$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) *.o *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call CLEAN)
 
 install:
-	@mkdir -p $(ROMFS_DIR)
-	@install $(BIN) $(ROMFS_DIR)/$(BIN)
+	$(Q) mkdir -p $(ROMFS_DIR)
+	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)
diff --git a/apps/examples/elf/tests/task/Makefile b/apps/examples/elf/tests/task/Makefile
index accac987f..cf56b1287 100644
--- a/apps/examples/elf/tests/task/Makefile
+++ b/apps/examples/elf/tests/task/Makefile
@@ -33,7 +33,6 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
 BIN = task
@@ -45,15 +44,16 @@ all: $(BIN)
 
 $(OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CELFFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
 
 $(BIN): $(OBJS)
 	@echo "LD: $<"
-	@$(LD) $(LDELFFLAGS) -o $@ $^
+	$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
 
-clean: 
-	@rm -f $(BIN) *.o *~ .*.swp core
+clean:
+	$(call DELFILE $(BIN))
+	$(call CLEAN)
 
 install:
-	@mkdir -p $(ROMFS_DIR)
-	@install $(BIN) $(ROMFS_DIR)/$(BIN)
+	$(Q) mkdir -p $(ROMFS_DIR)
+	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)
diff --git a/apps/examples/ftpc/Makefile b/apps/examples/ftpc/Makefile
index 9f9f689db..3cdc93060 100644
--- a/apps/examples/ftpc/Makefile
+++ b/apps/examples/ftpc/Makefile
@@ -98,10 +98,12 @@ context: .context
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f .context Make.dep .depend
+	$(call DELFILE .context)
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/apps/examples/ftpd/Makefile b/apps/examples/ftpd/Makefile
index cae8a282e..071784b8e 100644
--- a/apps/examples/ftpd/Makefile
+++ b/apps/examples/ftpd/Makefile
@@ -94,10 +94,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/apps/examples/hello/Makefile b/apps/examples/hello/Makefile
index 53fbead98..b35b97eb0 100644
--- a/apps/examples/hello/Makefile
+++ b/apps/examples/hello/Makefile
@@ -98,10 +98,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/apps/examples/helloxx/Makefile b/apps/examples/helloxx/Makefile
index 295d0116e..739f26252 100644
--- a/apps/examples/helloxx/Makefile
+++ b/apps/examples/helloxx/Makefile
@@ -115,10 +115,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/apps/examples/hidkbd/Makefile b/apps/examples/hidkbd/Makefile
index cb0f32c60..0dbfbdb77 100644
--- a/apps/examples/hidkbd/Makefile
+++ b/apps/examples/hidkbd/Makefile
@@ -86,10 +86,11 @@ 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/apps/examples/igmp/Makefile b/apps/examples/igmp/Makefile
index 5f9d4aa98..a94a97cf7 100644
--- a/apps/examples/igmp/Makefile
+++ b/apps/examples/igmp/Makefile
@@ -86,10 +86,11 @@ 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/apps/examples/json/Makefile b/apps/examples/json/Makefile
index 0551eccfe..bdd93fd17 100644
--- a/apps/examples/json/Makefile
+++ b/apps/examples/json/Makefile
@@ -96,10 +96,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/apps/examples/lcdrw/Makefile b/apps/examples/lcdrw/Makefile
index fab2a6939..bbe46025d 100644
--- a/apps/examples/lcdrw/Makefile
+++ b/apps/examples/lcdrw/Makefile
@@ -98,10 +98,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/apps/examples/mm/Makefile b/apps/examples/mm/Makefile
index 5d29c6d90..bb14a2e4e 100644
--- a/apps/examples/mm/Makefile
+++ b/apps/examples/mm/Makefile
@@ -86,10 +86,11 @@ 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/apps/examples/modbus/Makefile b/apps/examples/modbus/Makefile
index 937212f72..f6e964f51 100644
--- a/apps/examples/modbus/Makefile
+++ b/apps/examples/modbus/Makefile
@@ -98,10 +98,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/apps/examples/mount/Makefile b/apps/examples/mount/Makefile
index d244852d0..becc6670b 100644
--- a/apps/examples/mount/Makefile
+++ b/apps/examples/mount/Makefile
@@ -86,10 +86,11 @@ 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/apps/examples/nettest/Makefile b/apps/examples/nettest/Makefile
index c1c50bbb8..76ad94d6f 100644
--- a/apps/examples/nettest/Makefile
+++ b/apps/examples/nettest/Makefile
@@ -131,11 +131,13 @@ context: .context
 depend: .depend
 
 clean:
-	@rm -f $(HOST_BIN) .built *.o *~ .*.swp
+	$(call DELFILE $(HOST_BIN))
+	$(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/apps/examples/nsh/Makefile b/apps/examples/nsh/Makefile
index fdf5a2a90..0c0ebe8b9 100644
--- a/apps/examples/nsh/Makefile
+++ b/apps/examples/nsh/Makefile
@@ -86,10 +86,11 @@ 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/apps/examples/null/Makefile b/apps/examples/null/Makefile
index fa3b83d2a..d37d9e637 100644
--- a/apps/examples/null/Makefile
+++ b/apps/examples/null/Makefile
@@ -86,10 +86,11 @@ 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/apps/examples/nx/Makefile b/apps/examples/nx/Makefile
index 7bc861bbd..a77ad792a 100644
--- a/apps/examples/nx/Makefile
+++ b/apps/examples/nx/Makefile
@@ -101,10 +101,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/apps/examples/nxconsole/Makefile b/apps/examples/nxconsole/Makefile
index eb72c87b9..555511882 100644
--- a/apps/examples/nxconsole/Makefile
+++ b/apps/examples/nxconsole/Makefile
@@ -86,10 +86,11 @@ 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/apps/examples/nxffs/Makefile b/apps/examples/nxffs/Makefile
index c66a0ec33..be2a34eae 100644
--- a/apps/examples/nxffs/Makefile
+++ b/apps/examples/nxffs/Makefile
@@ -86,10 +86,11 @@ 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/apps/examples/nxflat/Makefile b/apps/examples/nxflat/Makefile
index 4fc315592..5f5a302c3 100644
--- a/apps/examples/nxflat/Makefile
+++ b/apps/examples/nxflat/Makefile
@@ -91,10 +91,11 @@ 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/apps/examples/nxflat/tests/errno/Makefile b/apps/examples/nxflat/tests/errno/Makefile
index df3ea1e3e..d05154525 100644
--- a/apps/examples/nxflat/tests/errno/Makefile
+++ b/apps/examples/nxflat/tests/errno/Makefile
@@ -33,8 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config	# Current configuration
--include $(TOPDIR)/Make.defs	# Basic make info
+-include $(TOPDIR)/Make.defs
 
 BIN			= errno
 
@@ -48,31 +47,35 @@ all: $(BIN)
 
 $(R1OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(R2OBJ): %.o: %.S
 	@echo "AS: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(BIN).r1: $(R1OBJS)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+	$(Q) $(LD) $(NXFLATLDFLAGS1) -o $@ $^
 
 $(R2SRC): $(BIN).r1
 	@echo "MK: $<"
-	@$(MKNXFLAT) -o $@ $^
+	$(Q) $(MKNXFLAT) -o $@ $^
 
 $(BIN).r2: $(R2OBJ)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
+	$(Q) $(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
 
 $(BIN): $(BIN).r2
 	@echo "LD: $<"
-	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+	$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) $(R2SRC) *.o *.r1 *.r2 *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call DELFILE $(R2SRC))
+	$(call DELFILE *.r1)
+	$(call DELFILE *.r2)
+	$(call CLEAN)
 
 install:
-	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+	$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
 
diff --git a/apps/examples/nxflat/tests/hello++/Makefile b/apps/examples/nxflat/tests/hello++/Makefile
index 3433145dc..445049e94 100644
--- a/apps/examples/nxflat/tests/hello++/Makefile
+++ b/apps/examples/nxflat/tests/hello++/Makefile
@@ -33,8 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config	# Current configuration
--include $(TOPDIR)/Make.defs	# Basic make info
+-include $(TOPDIR)/Make.defs
 
 BIN1			= hello++1
 BIN2			= hello++2
@@ -74,17 +73,17 @@ all: $(BIN1) $(BIN2) $(BIN3) # $(BIN4)
 
 $(R1CXXOBJS): %.o: %.cpp
 	@echo "CC: $<"
-	@$(CXX) -c $(CXXPICFLAGS) $< -o $@
+	$(Q) $(CXX) -c $(CXXPICFLAGS) $< -o $@
 
 $(R2AOBJS): %.o: %.S
 	@echo "AS: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 # This contains libstdc++ stubs to that you can build C++ code
 # without actually having libstdc++
 
 $(LIBSTDC_STUBS_LIB):
-	@$(MAKE) -C $(LIBSTDC_STUBS_DIR) TOPDIR=$(TOPDIR)
+	$(Q) $(MAKE) -C $(LIBSTDC_STUBS_DIR) TOPDIR=$(TOPDIR)
 
 # BIN1 and BIN2 link just like C code because they contain no
 # static constructors.  BIN1 is equivalent to a C hello world;
@@ -93,34 +92,34 @@ $(LIBSTDC_STUBS_LIB):
 
 $(BIN1).r1: $(R1OBJS1)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+	$(Q) $(LD) $(NXFLATLDFLAGS1) -o $@ $^
 
 $(R2SRC1): $(BIN1).r1
 	@echo "MK: $<"
-	@$(MKNXFLAT) -o $@ $^
+	$(Q) $(MKNXFLAT) -o $@ $^
 
 $(BIN1).r2: $(R2OBJ1)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS1) $(R2OBJ1)
+	$(Q) $(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS1) $(R2OBJ1)
 
 $(BIN1): $(BIN1).r2
 	@echo "LD: $<"
-	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+	$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
 
 $(BIN2).r1: $(R1OBJS2) $(LIBSTDC_STUBS_LIB)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+	$(Q) $(LD) $(NXFLATLDFLAGS1) -o $@ $^
 
 $(R2SRC2): $(BIN2).r1
 	@echo "MK: $<"
-	@$(MKNXFLAT) -o $@ $^
+	$(Q) $(MKNXFLAT) -o $@ $^
 
 $(BIN2).r2: $(R2OBJ2)
-	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS2) $(R2OBJ2)
+	$(Q) $(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS2) $(R2OBJ2)
 
 $(BIN2): $(BIN2).r2
 	@echo "LD: $<"
-	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+	$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
 
 # BIN3 and BIN4 require that we include --cxx in the xflat-ld command.
 # This will instruct xflat-ld that we want it to put together the correct
@@ -130,19 +129,19 @@ $(BIN2): $(BIN2).r2
 
 $(BIN3).r1: $(R1OBJS3) $(LIBSTDC_STUBS_LIB)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+	$(Q) $(LD) $(NXFLATLDFLAGS1) -o $@ $^
 
 $(R2SRC3): $(BIN3).r1
 	@echo "MK: $<"
-	@$(MKNXFLAT) -o $@ $^
+	$(Q) $(MKNXFLAT) -o $@ $^
 
 $(BIN3).r2: $(R2OBJ3)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS3) $(R2OBJ3)
+	$(Q) $(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS3) $(R2OBJ3)
 
 $(BIN3): $(BIN3).r2
 	@echo "LD: $<"
-	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+	$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
 
 # BIN4 is similar to BIN3 except that it uses the streams code from libstdc++
 #
@@ -164,13 +163,23 @@ $(BIN3): $(BIN3).r2
 #	$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(ALL_BIN) $(DERIVED) *.o *.r1 *.r2 *~ .*.swp core
+	$(call DELFILE $(BIN1))
+	$(call DELFILE $(BIN2))
+	$(call DELFILE $(BIN3))
+	$(call DELFILE $(BIN4))
+	$(call DELFILE $(R2SRC1))
+	$(call DELFILE $(R2SRC2))
+	$(call DELFILE $(R2SRC3))
+	$(call DELFILE $(R2SRC4))
+	$(call DELFILE *.r1)
+	$(call DELFILE *.r2)
+	$(call CLEAN)
 
 install: $(ALL_BIN)
-	@install -D $(BIN1) $(ROMFS_DIR)/$(BIN1)
-	@install -D $(BIN2) $(ROMFS_DIR)/$(BIN2)
-	@install -D $(BIN3) $(ROMFS_DIR)/$(BIN3)
-#	@install -D $(BIN4) $(ROMFS_DIR)/$(BIN4)
+	$(Q) install -D $(BIN1) $(ROMFS_DIR)/$(BIN1)
+	$(Q) install -D $(BIN2) $(ROMFS_DIR)/$(BIN2)
+	$(Q) install -D $(BIN3) $(ROMFS_DIR)/$(BIN3)
+#	$(Q) install -D $(BIN4) $(ROMFS_DIR)/$(BIN4)
 
 
 
diff --git a/apps/examples/nxflat/tests/hello/Makefile b/apps/examples/nxflat/tests/hello/Makefile
index e7e66c628..cf1a4eb80 100644
--- a/apps/examples/nxflat/tests/hello/Makefile
+++ b/apps/examples/nxflat/tests/hello/Makefile
@@ -33,8 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config	# Current configuration
--include $(TOPDIR)/Make.defs	# Basic make info
+-include $(TOPDIR)/Make.defs
 
 BIN			= hello
 
@@ -48,31 +47,35 @@ all: $(BIN)
 
 $(R1OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(R2OBJ): %.o: %.S
 	@echo "AS: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(BIN).r1: $(R1OBJS)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+	$(Q) $(LD) $(NXFLATLDFLAGS1) -o $@ $^
 
 $(R2SRC): $(BIN).r1
 	@echo "MK: $<"
-	@$(MKNXFLAT) -o $@ $^
+	$(Q) $(MKNXFLAT) -o $@ $^
 
 $(BIN).r2: $(R2OBJ)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
+	$(Q) $(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
 
 $(BIN): $(BIN).r2
 	@echo "LD: $<"
-	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+	$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) $(R2SRC) *.o *.r1 *.r2 *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call DELFILE $(R2SRC))
+	$(call DELFILE *.r1)
+	$(call DELFILE *.r2)
+	$(call CLEAN)
 
 install:
-	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+	$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
 
diff --git a/apps/examples/nxflat/tests/longjmp/Makefile b/apps/examples/nxflat/tests/longjmp/Makefile
index 47a1c4905..55deadbb7 100644
--- a/apps/examples/nxflat/tests/longjmp/Makefile
+++ b/apps/examples/nxflat/tests/longjmp/Makefile
@@ -33,8 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config	# Current configuration
--include $(TOPDIR)/Make.defs	# Basic make info
+-include $(TOPDIR)/Make.defs
 
 BIN			= longjmp
 
@@ -48,31 +47,35 @@ all: $(BIN)
 
 $(R1OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(R2OBJ): %.o: %.S
 	@echo "AS: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(BIN).r1: $(R1OBJS)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+	$(Q) $(LD) $(NXFLATLDFLAGS1) -o $@ $^
 
 $(R2SRC): $(BIN).r1
 	@echo "MK: $<"
-	@$(MKNXFLAT) -o $@ $^
+	$(Q) $(MKNXFLAT) -o $@ $^
 
 $(BIN).r2: $(R2OBJ)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
+	$(Q) $(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
 
 $(BIN): $(BIN).r2
 	@echo "LD: $<"
-	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+	$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) $(R2SRC) *.o *.r1 *.r2 *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call DELFILE $(R2SRC))
+	$(call DELFILE *.r1)
+	$(call DELFILE *.r2)
+	$(call CLEAN)
 
 install:
-	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+	$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
 
diff --git a/apps/examples/nxflat/tests/mutex/Makefile b/apps/examples/nxflat/tests/mutex/Makefile
index fe6684856..97e5c356e 100644
--- a/apps/examples/nxflat/tests/mutex/Makefile
+++ b/apps/examples/nxflat/tests/mutex/Makefile
@@ -33,8 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config	# Current configuration
--include $(TOPDIR)/Make.defs	# Basic make info
+-include $(TOPDIR)/Make.defs
 
 BIN			= mutex
 
@@ -48,31 +47,35 @@ all: $(BIN)
 
 $(R1OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(R2OBJ): %.o: %.S
 	@echo "AS: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(BIN).r1: $(R1OBJS)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+	$(Q) $(LD) $(NXFLATLDFLAGS1) -o $@ $^
 
 $(R2SRC): $(BIN).r1
 	@echo "MK: $<"
-	@$(MKNXFLAT) -o $@ $^
+	$(Q) $(MKNXFLAT) -o $@ $^
 
 $(BIN).r2: $(R2OBJ)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
+	$(Q) $(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
 
 $(BIN): $(BIN).r2
 	@echo "LD: $<"
-	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+	$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) $(R2SRC) *.o *.r1 *.r2 *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call DELFILE $(R2SRC))
+	$(call DELFILE *.r1)
+	$(call DELFILE *.r2)
+	$(call CLEAN)
 
 install:
-	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+	$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
 
diff --git a/apps/examples/nxflat/tests/pthread/Makefile b/apps/examples/nxflat/tests/pthread/Makefile
index f645441ad..5dd6a2a10 100644
--- a/apps/examples/nxflat/tests/pthread/Makefile
+++ b/apps/examples/nxflat/tests/pthread/Makefile
@@ -48,31 +48,35 @@ all: $(BIN)
 
 $(R1OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(R2OBJ): %.o: %.S
 	@echo "AS: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(BIN).r1: $(R1OBJS)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+	$(Q) $(LD) $(NXFLATLDFLAGS1) -o $@ $^
 
 $(R2SRC): $(BIN).r1
 	@echo "MK: $<"
-	@$(MKNXFLAT) -o $@ $^
+	$(Q) $(MKNXFLAT) -o $@ $^
 
 $(BIN).r2: $(R2OBJ)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
+	$(Q) $(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
 
 $(BIN): $(BIN).r2
 	@echo "LD: $<"
-	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+	$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) $(R2SRC) *.o *.r1 *.r2 *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call DELFILE $(R2SRC))
+	$(call DELFILE *.r1)
+	$(call DELFILE *.r2)
+	$(call CLEAN)
 
 install:
-	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+	$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
 
diff --git a/apps/examples/nxflat/tests/signal/Makefile b/apps/examples/nxflat/tests/signal/Makefile
index 222c57dbe..e39f3a8d4 100644
--- a/apps/examples/nxflat/tests/signal/Makefile
+++ b/apps/examples/nxflat/tests/signal/Makefile
@@ -33,8 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config	# Current configuration
--include $(TOPDIR)/Make.defs	# Basic make info
+-include $(TOPDIR)/Make.defs
 
 BIN			= signal
 
@@ -48,31 +47,35 @@ all: $(BIN)
 
 $(R1OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(R2OBJ): %.o: %.S
 	@echo "AS: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(BIN).r1: $(R1OBJS)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+	$(Q) $(LD) $(NXFLATLDFLAGS1) -o $@ $^
 
 $(R2SRC): $(BIN).r1
 	@echo "MK: $<"
-	@$(MKNXFLAT) -o $@ $^
+	$(Q) $(MKNXFLAT) -o $@ $^
 
 $(BIN).r2: $(R2OBJ)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
+	$(Q) $(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
 
 $(BIN): $(BIN).r2
 	@echo "LD: $<"
-	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+	$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) $(R2SRC) *.o *.r1 *.r2 *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call DELFILE $(R2SRC))
+	$(call DELFILE *.r1)
+	$(call DELFILE *.r2)
+	$(call CLEAN)
 
 install:
-	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+	$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
 
diff --git a/apps/examples/nxflat/tests/struct/Makefile b/apps/examples/nxflat/tests/struct/Makefile
index 69f9dd2f3..ac789f3f4 100644
--- a/apps/examples/nxflat/tests/struct/Makefile
+++ b/apps/examples/nxflat/tests/struct/Makefile
@@ -33,8 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config	# Current configuration
--include $(TOPDIR)/Make.defs	# Basic make info
+-include $(TOPDIR)/Make.defs
 
 CFLAGS			+= -I.
 
@@ -50,31 +49,35 @@ all: $(BIN)
 
 $(R1OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(R2OBJ): %.o: %.S
 	@echo "AS: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(BIN).r1: $(R1OBJS)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+	$(Q) $(LD) $(NXFLATLDFLAGS1) -o $@ $^
 
 $(R2SRC): $(BIN).r1
 	@echo "MK: $<"
-	@$(MKNXFLAT) -o $@ $^
+	$(Q) $(MKNXFLAT) -o $@ $^
 
 $(BIN).r2: $(R2OBJ)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
+	$(Q) $(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
 
 $(BIN): $(BIN).r2
 	@echo "LD: $<"
-	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+	$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) $(R2SRC) *.o *.r1 *.r2 *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call DELFILE $(R2SRC))
+	$(call DELFILE *.r1)
+	$(call DELFILE *.r2)
+	$(call CLEAN)
 
 install:
-	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+	$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
 
diff --git a/apps/examples/nxflat/tests/task/Makefile b/apps/examples/nxflat/tests/task/Makefile
index 8b17ec822..d27213817 100644
--- a/apps/examples/nxflat/tests/task/Makefile
+++ b/apps/examples/nxflat/tests/task/Makefile
@@ -33,8 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config	# Current configuration
--include $(TOPDIR)/Make.defs	# Basic make info
+-include $(TOPDIR)/Make.defs
 
 BIN			= task
 
@@ -48,32 +47,36 @@ all: $(BIN)
 
 $(R1OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(R2OBJ): %.o: %.S
 	@echo "AS: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(BIN).r1: $(R1OBJS)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+	$(Q) $(LD) $(NXFLATLDFLAGS1) -o $@ $^
 
 $(R2SRC): $(BIN).r1
 	@echo "MK: $<"
-	@$(MKNXFLAT) -o $@ $^
+	$(Q) $(MKNXFLAT) -o $@ $^
 
 $(BIN).r2: $(R2OBJ)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
+	$(Q) $(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
 
 $(BIN): $(BIN).r2
 	@echo "LD: $<"
-	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+	$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) $(R2SRC) *.o *.r1 *.r2 *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call DELFILE $(R2SRC))
+	$(call DELFILE *.r1)
+	$(call DELFILE *.r2)
+	$(call CLEAN)
 
 install:
-	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+	$(Q) install -D $(BIN) $(ROMFS_DIR)/$(BIN)
 
 
diff --git a/apps/examples/nxhello/Makefile b/apps/examples/nxhello/Makefile
index 6ab65c53d..be52882c3 100644
--- a/apps/examples/nxhello/Makefile
+++ b/apps/examples/nxhello/Makefile
@@ -98,10 +98,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/apps/examples/nximage/Makefile b/apps/examples/nximage/Makefile
index b552c0bf6..b20e46350 100644
--- a/apps/examples/nximage/Makefile
+++ b/apps/examples/nximage/Makefile
@@ -98,10 +98,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/apps/examples/nxlines/Makefile b/apps/examples/nxlines/Makefile
index b52da37d2..cd5753ef9 100644
--- a/apps/examples/nxlines/Makefile
+++ b/apps/examples/nxlines/Makefile
@@ -98,10 +98,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/apps/examples/nxtext/Makefile b/apps/examples/nxtext/Makefile
index 5067d2af7..68c4a026f 100644
--- a/apps/examples/nxtext/Makefile
+++ b/apps/examples/nxtext/Makefile
@@ -102,10 +102,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/apps/examples/ostest/Makefile b/apps/examples/ostest/Makefile
index e49013918..2d93126ad 100644
--- a/apps/examples/ostest/Makefile
+++ b/apps/examples/ostest/Makefile
@@ -142,10 +142,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/apps/examples/pashello/Makefile b/apps/examples/pashello/Makefile
index af33975d0..df86e7d62 100644
--- a/apps/examples/pashello/Makefile
+++ b/apps/examples/pashello/Makefile
@@ -86,10 +86,11 @@ 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/apps/examples/pipe/Makefile b/apps/examples/pipe/Makefile
index e0168ed0a..e6cefbcdb 100644
--- a/apps/examples/pipe/Makefile
+++ b/apps/examples/pipe/Makefile
@@ -86,10 +86,11 @@ 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/apps/examples/poll/Makefile b/apps/examples/poll/Makefile
index 89b314511..dc33d6b49 100644
--- a/apps/examples/poll/Makefile
+++ b/apps/examples/poll/Makefile
@@ -87,10 +87,12 @@ context:
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend host
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
+	$(call DELFILE host$(HOSTEXEEXT))
 
 -include Make.dep
diff --git a/apps/examples/pwm/Makefile b/apps/examples/pwm/Makefile
index 6aeb38594..c7cc700bd 100644
--- a/apps/examples/pwm/Makefile
+++ b/apps/examples/pwm/Makefile
@@ -96,10 +96,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/apps/examples/qencoder/Makefile b/apps/examples/qencoder/Makefile
index 483043c46..817ba17cc 100644
--- a/apps/examples/qencoder/Makefile
+++ b/apps/examples/qencoder/Makefile
@@ -98,10 +98,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/apps/examples/relays/Makefile b/apps/examples/relays/Makefile
index bb988f775..385bc8520 100644
--- a/apps/examples/relays/Makefile
+++ b/apps/examples/relays/Makefile
@@ -98,10 +98,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/apps/examples/rgmp/Makefile b/apps/examples/rgmp/Makefile
index c7e2c5979..72d5e660a 100644
--- a/apps/examples/rgmp/Makefile
+++ b/apps/examples/rgmp/Makefile
@@ -86,10 +86,11 @@ 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/apps/examples/romfs/Makefile b/apps/examples/romfs/Makefile
index 370141276..5190a7a6e 100644
--- a/apps/examples/romfs/Makefile
+++ b/apps/examples/romfs/Makefile
@@ -103,11 +103,13 @@ context:
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend testdir.img
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
+	$(call DELFILE testdir.img)
 
 -include Make.dep
 
diff --git a/apps/examples/sendmail/Makefile b/apps/examples/sendmail/Makefile
index e8d05ceab..049321b52 100644
--- a/apps/examples/sendmail/Makefile
+++ b/apps/examples/sendmail/Makefile
@@ -87,12 +87,13 @@ context:
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 	@$(MAKE) -f Makefile.host clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
 
diff --git a/apps/examples/sendmail/Makefile.host b/apps/examples/sendmail/Makefile.host
index bef7eebbf..e6ff39540 100644
--- a/apps/examples/sendmail/Makefile.host
+++ b/apps/examples/sendmail/Makefile.host
@@ -71,7 +71,9 @@ $(BIN): headers $(OBJS)
 	$(HOSTCC) $(HOSTLDFLAGS) $(OBJS) -o $@
 
 clean:
-	@rm -f $(BIN).* *.o1 *~
+	$(call DELFILE $(BIN).*)
+	$(call DELFILE *.o1)
+	$(call CLEAN)
 	@rm -rf include
 
 
diff --git a/apps/examples/serloop/Makefile b/apps/examples/serloop/Makefile
index ecf7984e5..01d2c60fe 100644
--- a/apps/examples/serloop/Makefile
+++ b/apps/examples/serloop/Makefile
@@ -87,11 +87,12 @@ 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/apps/examples/telnetd/Makefile b/apps/examples/telnetd/Makefile
index 7c541cba9..a1f0f7c63 100644
--- a/apps/examples/telnetd/Makefile
+++ b/apps/examples/telnetd/Makefile
@@ -98,10 +98,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/apps/examples/thttpd/Makefile b/apps/examples/thttpd/Makefile
index 10bcb9af0..5320a0a13 100644
--- a/apps/examples/thttpd/Makefile
+++ b/apps/examples/thttpd/Makefile
@@ -89,12 +89,13 @@ context:
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	@$(MAKE) -C content clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
 
diff --git a/apps/examples/thttpd/content/Makefile b/apps/examples/thttpd/content/Makefile
index 1f5ce4246..8a74201b5 100644
--- a/apps/examples/thttpd/content/Makefile
+++ b/apps/examples/thttpd/content/Makefile
@@ -97,8 +97,10 @@ $(SYMTAB): build
 # Clean each subdirectory
 
 clean: $(foreach DIR, $(SUBDIRS), $(DIR)_clean)
-	@rm -f $(ROMFS_HDR) $(ROMFS_IMG) $(SYMTAB)
+	$(call DELFILE$(ROMFS_HDR))
+	$(call DELFILE $(ROMFS_IMG))
+	$(call DELFILE $(SYMTAB))
 	@rm -rf $(ROMFS_DIR)
-	@rm -f *~ .*.swp
+	$(call CLEAN)
 
 
diff --git a/apps/examples/thttpd/content/hello/Makefile b/apps/examples/thttpd/content/hello/Makefile
index 76d4e67c8..74ff2116a 100644
--- a/apps/examples/thttpd/content/hello/Makefile
+++ b/apps/examples/thttpd/content/hello/Makefile
@@ -33,8 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config	# Current configuration
--include $(TOPDIR)/Make.defs	# Basic make info
+-include $(TOPDIR)/Make.defs
 
 BIN			= hello
 
@@ -48,31 +47,35 @@ all: $(BIN)
 
 $(R1OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(R2OBJ): %.o: %.S
 	@echo "AS: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(BIN).r1: $(R1OBJS)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+	$(Q) $(LD) $(NXFLATLDFLAGS1) -o $@ $^
 
 $(R2SRC): $(BIN).r1
 	@echo "MK: $<"
-	@$(MKNXFLAT) -o $@ $^
+	$(Q) $(MKNXFLAT) -o $@ $^
 
 $(BIN).r2: $(R2OBJ)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
+	$(Q) $(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
 
 $(BIN): $(BIN).r2
 	@echo "LD: $<"
-	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+	$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) $(R2SRC) *.o *.r1 *.r2 *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call DELFILE $(R2SRC))
+	$(call DELFILE *.r1)
+	$(call DELFILE *.r2)
+	$(call CLEAN)
 
 install:
-	@install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN)
+	$(Q) install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN)
 
diff --git a/apps/examples/thttpd/content/netstat/Makefile b/apps/examples/thttpd/content/netstat/Makefile
index 9769c9207..d9953547a 100644
--- a/apps/examples/thttpd/content/netstat/Makefile
+++ b/apps/examples/thttpd/content/netstat/Makefile
@@ -33,8 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config	# Current configuration
--include $(TOPDIR)/Make.defs	# Basic make info
+-include $(TOPDIR)/Make.defs
 
 BIN			= netstat
 
@@ -48,31 +47,35 @@ all: $(BIN)
 
 $(R1OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(R2OBJ): %.o: %.S
 	@echo "AS: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(BIN).r1: $(R1OBJS)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+	$(Q) $(LD) $(NXFLATLDFLAGS1) -o $@ $^
 
 $(R2SRC): $(BIN).r1
 	@echo "MK: $<"
-	@$(MKNXFLAT) -o $@ $^
+	$(Q) $(MKNXFLAT) -o $@ $^
 
 $(BIN).r2: $(R2OBJ)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
+	$(Q) $(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
 
 $(BIN): $(BIN).r2
 	@echo "LD: $<"
-	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+	$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) $(R2SRC) *.o *.r1 *.r2 *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call DELFILE $(R2SRC))
+	$(call DELFILE *.r1)
+	$(call DELFILE *.r2)
+	$(call CLEAN)
 
 install:
-	@install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN)
+	$(Q) install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN)
 
diff --git a/apps/examples/thttpd/content/tasks/Makefile b/apps/examples/thttpd/content/tasks/Makefile
index b76c3f22a..c668285d8 100644
--- a/apps/examples/thttpd/content/tasks/Makefile
+++ b/apps/examples/thttpd/content/tasks/Makefile
@@ -33,8 +33,7 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config	# Current configuration
--include $(TOPDIR)/Make.defs	# Basic make info
+-include $(TOPDIR)/Make.defs
 
 BIN			= tasks
 
@@ -48,31 +47,35 @@ all: $(BIN)
 
 $(R1OBJS): %.o: %.c
 	@echo "CC: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(R2OBJ): %.o: %.S
 	@echo "AS: $<"
-	@$(CC) -c $(CPICFLAGS) $< -o $@
+	$(Q) $(CC) -c $(CPICFLAGS) $< -o $@
 
 $(BIN).r1: $(R1OBJS)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+	$(Q) $(LD) $(NXFLATLDFLAGS1) -o $@ $^
 
 $(R2SRC): $(BIN).r1
 	@echo "MK: $<"
-	@$(MKNXFLAT) -o $@ $^
+	$(Q) $(MKNXFLAT) -o $@ $^
 
 $(BIN).r2: $(R2OBJ)
 	@echo "LD: $<"
-	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
+	$(Q) $(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
 
 $(BIN): $(BIN).r2
 	@echo "LD: $<"
-	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+	$(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
 
 clean: 
-	@rm -f $(BIN) $(R2SRC) *.o *.r1 *.r2 *~ .*.swp core
+	$(call DELFILE $(BIN))
+	$(call DELFILE $(R2SRC))
+	$(call DELFILE *.r1)
+	$(call DELFILE *.r2)
+	$(call CLEAN)
 
 install:
-	@install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN)
+	$(Q) install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN)
 
diff --git a/apps/examples/tiff/Makefile b/apps/examples/tiff/Makefile
index 73a687c25..373c07ca7 100644
--- a/apps/examples/tiff/Makefile
+++ b/apps/examples/tiff/Makefile
@@ -98,11 +98,14 @@ context: .context
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
-	@rm -f result.tif tmpfile1.dat tmpfile2.dat
+	$(call DELFILE .built)
+	$(call DELFILE result.tif)
+	$(call DELFILE tmpfile1.dat)
+	$(call DELFILE tmpfile2.dat)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
diff --git a/apps/examples/touchscreen/Makefile b/apps/examples/touchscreen/Makefile
index ad1036316..f25296620 100644
--- a/apps/examples/touchscreen/Makefile
+++ b/apps/examples/touchscreen/Makefile
@@ -98,10 +98,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/apps/examples/udp/Makefile b/apps/examples/udp/Makefile
index d6c89cac4..79606c69b 100644
--- a/apps/examples/udp/Makefile
+++ b/apps/examples/udp/Makefile
@@ -116,11 +116,14 @@ context:
 depend: .depend
 
 clean:
-	@rm -f $(TARG_BIN) $(HOST_BIN) *.o *~ .*.swp .built
+	$(call DELFILE .built)
+	$(call DELFILE $(TARG_BIN))
+	$(call DELFILE $(HOST_BIN))
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
 
diff --git a/apps/examples/uip/Makefile b/apps/examples/uip/Makefile
index 487512072..99e140f04 100644
--- a/apps/examples/uip/Makefile
+++ b/apps/examples/uip/Makefile
@@ -89,12 +89,13 @@ context:
 epend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
-	@rm -f httpd_fsdata.c
+	$(call DELFILE .built)
+	$(call DELFILE httpd_fsdata.c)
 	$(call CLEAN)
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
 
diff --git a/apps/examples/usbserial/Makefile b/apps/examples/usbserial/Makefile
index 0761dd48c..2c34fa275 100644
--- a/apps/examples/usbserial/Makefile
+++ b/apps/examples/usbserial/Makefile
@@ -33,7 +33,6 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 include $(APPDIR)/Make.defs
 
@@ -86,12 +85,13 @@ context:
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 	@$(MAKE) -f Makefile.host clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
 
diff --git a/apps/examples/usbserial/Makefile.host b/apps/examples/usbserial/Makefile.host
index 628304cd4..9fb43269d 100644
--- a/apps/examples/usbserial/Makefile.host
+++ b/apps/examples/usbserial/Makefile.host
@@ -35,7 +35,6 @@
 
 # TOPDIR must be defined on the make command line 
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
 SRC	= host.c
@@ -61,7 +60,5 @@ $(BIN): $(SRC)
 	@$(HOSTCC) $(HOSTCFLAGS) $(DEFINES) $^ -o $@
 
 clean:
-	@rm -f $(BIN) *~ .*.swp *.o
+	$(call DELFILE  $(BIN))
 	$(call CLEAN)
-
-
diff --git a/apps/examples/usbstorage/Makefile b/apps/examples/usbstorage/Makefile
index 8c142e0c6..4c8323e00 100644
--- a/apps/examples/usbstorage/Makefile
+++ b/apps/examples/usbstorage/Makefile
@@ -103,11 +103,12 @@ 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/apps/examples/usbterm/Makefile b/apps/examples/usbterm/Makefile
index 6622759f6..acf9812bd 100644
--- a/apps/examples/usbterm/Makefile
+++ b/apps/examples/usbterm/Makefile
@@ -98,11 +98,12 @@ 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/apps/examples/watchdog/Makefile b/apps/examples/watchdog/Makefile
index f3c9a8bf9..8bbdbfea6 100644
--- a/apps/examples/watchdog/Makefile
+++ b/apps/examples/watchdog/Makefile
@@ -96,10 +96,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/apps/examples/wget/Makefile b/apps/examples/wget/Makefile
index 859ae999d..d74c248e9 100644
--- a/apps/examples/wget/Makefile
+++ b/apps/examples/wget/Makefile
@@ -86,12 +86,13 @@ context:
 depend: .depend
 
 clean:
-	@rm -f *.o *~ .*.swp .built
+	$(call DELFILE .built)
 	$(call CLEAN)
 	@$(MAKE) -f Makefile.host clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
 
 distclean: clean
-	@rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
 
diff --git a/apps/examples/wget/Makefile.host b/apps/examples/wget/Makefile.host
index 5d746441a..14da45c7e 100644
--- a/apps/examples/wget/Makefile.host
+++ b/apps/examples/wget/Makefile.host
@@ -71,7 +71,9 @@ $(BIN): headers $(OBJS)
 	$(HOSTCC) $(HOSTLDFLAGS) $(OBJS) -o $@
 
 clean:
-	@rm -f $(BIN).* *.o1 *~
+	$(call DELFILE $(BIN).*)
+	$(call DELFILE *.o1)
+	$(call CLEAN)
 	@rm -rf net nuttx
 
 
diff --git a/apps/examples/wgetjson/Makefile b/apps/examples/wgetjson/Makefile
index c03715ad5..96748defb 100644
--- a/apps/examples/wgetjson/Makefile
+++ b/apps/examples/wgetjson/Makefile
@@ -98,10 +98,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/apps/examples/wlan/Makefile b/apps/examples/wlan/Makefile
index c50b13227..be2dbea7a 100644
--- a/apps/examples/wlan/Makefile
+++ b/apps/examples/wlan/Makefile
@@ -87,11 +87,12 @@ 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/apps/examples/xmlrpc/Makefile b/apps/examples/xmlrpc/Makefile
index 84d3ed4be..5ab60a0dd 100644
--- a/apps/examples/xmlrpc/Makefile
+++ b/apps/examples/xmlrpc/Makefile
@@ -99,10 +99,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