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

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

3 files changed, 36 insertions, 36 deletions

diff --git a/nuttx/graphics/Makefile b/nuttx/graphics/Makefile
index d0fdb647d..ddcfd21d2 100644
--- a/nuttx/graphics/Makefile
+++ b/nuttx/graphics/Makefile
@@ -33,7 +33,6 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
 DEPPATH		= --dep-path .
@@ -201,13 +200,14 @@ context: gensources
 clean:
 	$(Q) $(MAKE) -C nxglib -f Makefile.sources clean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES)
 	$(Q) $(MAKE) -C nxfonts -f Makefile.sources clean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES)
-	$(Q) rm -f $(BIN) *~ .*.swp
+	$(call DELFILE $(BIN))
 	$(call CLEAN)
 
 distclean: clean
 	$(Q) $(MAKE) -C nxglib -f Makefile.sources distclean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES)
 	$(Q) $(MAKE) -C nxfonts -f Makefile.sources distclean TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES)
-	$(Q) rm -f Make.dep .depend
+	$(call DELFILE Make.dep)
+	$(call DELFILE .depend)
 
 -include Make.dep
 
diff --git a/nuttx/graphics/nxfonts/Makefile.sources b/nuttx/graphics/nxfonts/Makefile.sources
index f2aa87caf..eeb47d1b2 100644
--- a/nuttx/graphics/nxfonts/Makefile.sources
+++ b/nuttx/graphics/nxfonts/Makefile.sources
@@ -33,7 +33,6 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
 ifdef NXFONTS_BITSPERPIXEL
@@ -177,13 +176,14 @@ all:	$(GEN_CSRC)
 .PHONY : clean distclean
 
 $(GEN_CSRC) : $(DEPENDENCY)
-	@$(call PREPROCESS, $<, $(GEN_TMP))
-	@cat $(GEN_TMP) | sed -e "/^#/d" >$@
-	@rm -f  $(GEN_TMP)
+	$(call PREPROCESS, $<, $(GEN_TMP))
+	$(Q) cat $(GEN_TMP) | sed -e "/^#/d" >$@
+	$(Q) rm -f  $(GEN_TMP)
 
 clean:
-	@rm -f *~ .*.swp *.i
+	$(call DELFILE *.i)
+	$(call CLEAN)
 
 distclean: clean
-	@rm -f nxfonts_convert_*bpp.c
-	@rm -f nxfonts_bitmaps_*.c
+	$(call DELFILE nxfonts_convert_*bpp.c)
+	$(call DELFILE nxfonts_bitmaps_*.c)
diff --git a/nuttx/graphics/nxglib/Makefile.sources b/nuttx/graphics/nxglib/Makefile.sources
index 67f8defc3..bb94c1b20 100644
--- a/nuttx/graphics/nxglib/Makefile.sources
+++ b/nuttx/graphics/nxglib/Makefile.sources
@@ -33,7 +33,6 @@
 #
 ############################################################################
 
--include $(TOPDIR)/.config
 -include $(TOPDIR)/Make.defs
 
 ifeq ($(NXGLIB_BITSPERPIXEL),1)
@@ -123,53 +122,54 @@ all:	$(GEN_CSRCS)
 
 $(SETP_CSRC) : $(BLITDIR)/nxglib_setpixel.c nxglib_bitblit.h
 ifneq ($(NXGLIB_BITSPERPIXEL),)
-	@$(call PREPROCESS, $(BLITDIR)/nxglib_setpixel.c, $(SETP_TMP))
-	@cat $(SETP_TMP) | sed -e "/^#/d" >$@
-	@rm -f  $(SETP_TMP)
+	$(call PREPROCESS, $(BLITDIR)/nxglib_setpixel.c, $(SETP_TMP))
+	$(Q) cat $(SETP_TMP) | sed -e "/^#/d" >$@
+	$(Q) rm -f  $(SETP_TMP)
 endif
 
 $(RFILL_CSRC) : $(BLITDIR)/nxglib_fillrectangle.c nxglib_bitblit.h
 ifneq ($(NXGLIB_BITSPERPIXEL),)
-	@$(call PREPROCESS, $(BLITDIR)/nxglib_fillrectangle.c, $(RFILL_TMP))
-	@cat $(RFILL_TMP) | sed -e "/^#/d" >$@
-	@rm -f  $(RFILL_TMP)
+	$(call PREPROCESS, $(BLITDIR)/nxglib_fillrectangle.c, $(RFILL_TMP))
+	$(Q) cat $(RFILL_TMP) | sed -e "/^#/d" >$@
+	$(Q) rm -f  $(RFILL_TMP)
 endif
 
 $(RGET_CSRC) : $(BLITDIR)/nxglib_getrectangle.c nxglib_bitblit.h
 ifneq ($(NXGLIB_BITSPERPIXEL),)
-	@$(call PREPROCESS, $(BLITDIR)/nxglib_getrectangle.c, $(RGET_TMP))
-	@cat $(RGET_TMP) | sed -e "/^#/d" >$@
-	@rm -f  $(RGET_TMP)
+	$(call PREPROCESS, $(BLITDIR)/nxglib_getrectangle.c, $(RGET_TMP))
+	$(Q) cat $(RGET_TMP) | sed -e "/^#/d" >$@
+	$(Q) rm -f  $(RGET_TMP)
 endif
 
 $(TFILL_CSRC) : $(BLITDIR)/nxglib_filltrapezoid.c nxglib_bitblit.h
 ifneq ($(NXGLIB_BITSPERPIXEL),)
-	@$(call PREPROCESS, $(BLITDIR)/nxglib_filltrapezoid.c, $(TFILL_TMP))
-	@cat $(TFILL_TMP) | sed -e "/^#/d" >$@
-	@rm -f  $(TFILL_TMP)
+	$(call PREPROCESS, $(BLITDIR)/nxglib_filltrapezoid.c, $(TFILL_TMP))
+	$(Q) cat $(TFILL_TMP) | sed -e "/^#/d" >$@
+	$(Q) rm -f  $(TFILL_TMP)
 endif
 
 $(RMOVE_CSRC) : $(BLITDIR)/nxglib_moverectangle.c nxglib_bitblit.h
 ifneq ($(NXGLIB_BITSPERPIXEL),)
-	@$(call PREPROCESS, $(BLITDIR)/nxglib_moverectangle.c, $(RMOVE_TMP))
-	@cat $(RMOVE_TMP) | sed -e "/^#/d" >$@
-	@rm -f  $(RMOVE_TMP)
+	$(call PREPROCESS, $(BLITDIR)/nxglib_moverectangle.c, $(RMOVE_TMP))
+	$(Q) cat $(RMOVE_TMP) | sed -e "/^#/d" >$@
+	$(Q) rm -f  $(RMOVE_TMP)
 endif
 
 $(RCOPY_CSRC) : $(BLITDIR)/nxglib_copyrectangle.c nxglib_bitblit.h
 ifneq ($(NXGLIB_BITSPERPIXEL),)
-	@$(call PREPROCESS, $(BLITDIR)/nxglib_copyrectangle.c, $(RCOPY_TMP))
-	@cat $(RCOPY_TMP) | sed -e "/^#/d" >$@
-	@rm -f  $(RCOPY_TMP)
+	$(call PREPROCESS, $(BLITDIR)/nxglib_copyrectangle.c, $(RCOPY_TMP))
+	$(Q) cat $(RCOPY_TMP) | sed -e "/^#/d" >$@
+	$(Q) rm -f  $(RCOPY_TMP)
 endif
 
 clean:
-	@rm -f *~ .*.swp *.i
+	$(call DELFILE *.i)
+	$(call CLEAN)
 
 distclean: clean
-	@rm -f nxglib_setpixel_*bpp.c
-	@rm -f nxglib_fillrectangle_*bpp.c
-	@rm -f nxglib_getrectangle_*bpp.c
-	@rm -f nxglib_filltrapezoid_*bpp.c
-	@rm -f nxglib_moverectangle_*bpp.c
-	@rm -f nxglib_copyrectangle_*bpp.c
+	$(call DELFILE nxglib_setpixel_*bpp.c)
+	$(call DELFILE nxglib_fillrectangle_*bpp.c)
+	$(call DELFILE nxglib_getrectangle_*bpp.c)
+	$(call DELFILE nxglib_filltrapezoid_*bpp.c)
+	$(call DELFILE nxglib_moverectangle_*bpp.c)
+	$(call DELFILE nxglib_copyrectangle_*bpp.c)