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

10 files changed, 137 insertions, 102 deletions

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)