Clean operations are now toolchain specific

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@542 42af7a65-404d-4744-a932-0658087f49c3
2008-01-10 13:38:13 +00:00 · 2008-01-10 13:38:13 +00:00 · 0e4924079a
commit 0e4924079a
parent 435528e7a0
31 changed files with 83 additions and 49 deletions
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@ -16,7 +16,7 @@
  </b></big>
  <p><small>by</small></p>
  <p>Gregory Nutt</p>
-  <p><small>Last Update: January 6, 2006</small></p>
+  <p><small>Last Update: January 10, 2008</small></p>
 </center>

 <center><h1>Table of Contents</h1></center>
@ -518,7 +518,7 @@
    <ul>
      <li>Tools: CC, LD, AR, NM, OBJCOPY, OBJDUMP</li>
      <li>Tool options: CFLAGS, LDFLAGS</li>
-      <li>COMPILE, ASSEMBLE, ARCHIVE, and MKDEP macros</li>
+      <li>COMPILE, ASSEMBLE, ARCHIVE, CLEAN, and MKDEP macros</li>
    </ul>
    <p>
      When this makefile fragment runs, it will be passed TOPDIR which
--- a/4
+++ b/4
@ -217,7 +217,7 @@ subdir_clean:
 	@$(MAKE) -C mm -f Makefile.test TOPDIR="$(TOPDIR)" clean

 clean: subdir_clean
-	rm -f $(BIN) $(BIN).* mm_test *.map *~
+	@rm -f $(BIN) $(BIN).* mm_test *.map *~

 subdir_distclean:
 	@for dir in $(CLEANDIRS) ; do \
@ -227,6 +227,6 @@ subdir_distclean:
 	done

 distclean: clean subdir_distclean clean_context
-	rm -f Make.defs setenv.sh .config
+	@rm -f Make.defs setenv.sh .config


--- a/arch/arm/src/Makefile
+++ b/arch/arm/src/Makefile
@ -111,8 +111,8 @@ clean:
 	@if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
 	fi
-	@rm -f libarch$(LIBEXT) *~
-	@if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
 	@if [ -e board/Makefile ]; then \
--- a/arch/c5471/src/Makefile
+++ b/arch/c5471/src/Makefile
@ -113,7 +113,8 @@ clean:
 	@if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR=$(TOPDIR) clean ; \
 	fi
-	rm -f libarch$(LIBEXT) *.o *.obj *~
+	@rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
 	@if [ -e board/Makefile ]; then \
--- a/arch/dm320/src/Makefile
+++ b/arch/dm320/src/Makefile
@ -113,12 +113,13 @@ clean:
 	@if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR=$(TOPDIR) clean ; \
 	fi
-	rm -f libarch$(LIBEXT) *.o *.obj *~
+	@rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
 	@if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR=$(TOPDIR) distclean ; \
 	fi
-	rm -f Make.dep .depend
+	@rm -f Make.dep .depend

 -include Make.dep
--- a/arch/pjrc-8051/src/Makefile
+++ b/arch/pjrc-8051/src/Makefile
@ -211,9 +211,8 @@ clean:
 	@if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR=$(TOPDIR) clean ; \
 	fi
-	rm -f libarch$(LIBEXT) up_mem.h
-	rm -f *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libarch$(LIBEXT) up_mem.h *~ .*.swp
+	$(call CLEAN)

 distclean: clean
 	@if [ -e board/Makefile ]; then \
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@ -101,8 +101,8 @@ nuttx$(EXEEXT): $(LINKOBJS)
 depend: .depend

 clean:
-	@rm -f libarch$(LIBEXT) *~
-	@if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
 	@rm -f Make.dep .depend
--- a/arch/z16/src/Makefile
+++ b/arch/z16/src/Makefile
@ -99,8 +99,8 @@ clean:
 	@if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
 	fi
-	@rm -f libarch$(LIBEXT) *~
-	@if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libarch$(LIBEXT) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
 	@if [ -e board/Makefile ]; then \
--- a/arch/z80/src/Makefile
+++ b/arch/z80/src/Makefile
@ -234,10 +234,8 @@ clean:
 	@if [ -e board/Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
 	fi
-	rm -f libarch$(LIBEXT) up_mem.h asm_mem.h pass1.* nuttx.*
-	rm -f *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex
-	rm -f core *~ .*.swp *.swp
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libarch$(LIBEXT) up_mem.h asm_mem.h pass1.* nuttx.* *~ .*.swp
+	$(call CLEAN)

 distclean: clean
 	@if [ -e board/Makefile ]; then \
--- a/configs/README.txt
+++ b/configs/README.txt
@ -81,7 +81,7 @@ Make.defs -- This makefile fragment provides architecture and

 	Tools: CC, LD, AR, NM, OBJCOPY, OBJDUMP
 	Tool options: CFLAGS, LDFLAGS
-	COMPILE, ASSEMBLE, ARCHIVE, and MKDEP macros
+	COMPILE, ASSEMBLE, ARCHIVE, CLEAN, and MKDEP macros

  When this makefile fragment runs, it will be passed TOPDIR which
  is the path to the root directory of the build.  This makefile
--- a/configs/c5471evm/Make.defs
+++ b/configs/c5471evm/Make.defs
@ -84,6 +84,10 @@ define ARCHIVE
 	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
 endef

+define CLEAN
+	@rm -f *.o *.a
+endef
+
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh

 HOSTCC			= gcc
--- a/configs/c5471evm/src/Makefile
+++ b/configs/c5471evm/src/Makefile
@ -68,8 +68,8 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend

 clean:
-	rm -f libboard$(LIBEXT) *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
 	rm -f Make.dep .depend
--- a/configs/m68332evb/Make.defs
+++ b/configs/m68332evb/Make.defs
@ -84,6 +84,10 @@ define ARCHIVE
 	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
 endef

+define CLEAN
+	@rm -f *.o *.a
+endef
+
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh

 HOSTCC			= gcc
--- a/configs/m68332evb/src/Makefile
+++ b/configs/m68332evb/src/Makefile
@ -65,8 +65,8 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend

 clean:
-	rm -f libboard$(LIBEXT) *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
 	rm -f Make.dep .depend
--- a/configs/mcu123-lpc214x/Make.defs
+++ b/configs/mcu123-lpc214x/Make.defs
@ -84,6 +84,10 @@ define ARCHIVE
 	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
 endef

+define CLEAN
+	@rm -f *.o *.a
+endef
+
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh

 HOSTCC			= gcc
--- a/configs/mcu123-lpc214x/src/Makefile
+++ b/configs/mcu123-lpc214x/src/Makefile
@ -68,8 +68,8 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend

 clean:
-	rm -f libboard$(LIBEXT) *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
 	rm -f Make.dep .depend
--- a/configs/ntosd-dm320/Make.defs
+++ b/configs/ntosd-dm320/Make.defs
@ -84,6 +84,10 @@ define ARCHIVE
 	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
 endef

+define CLEAN
+	@rm -f *.o *.a
+endef
+
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh

 HOSTCC			= gcc
--- a/configs/ntosd-dm320/src/Makefile
+++ b/configs/ntosd-dm320/src/Makefile
@ -68,8 +68,8 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend

 clean:
-	rm -f libboard$(LIBEXT) *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
 	rm -f Make.dep .depend
--- a/configs/pjrc-8051/Make.defs
+++ b/configs/pjrc-8051/Make.defs
@ -77,6 +77,10 @@ define ARCHIVE
 	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
 endef

+define CLEAN
+	@rm -f *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex
+endef
+
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh

 HOSTCC			= gcc
--- a/configs/pjrc-8051/src/Makefile
+++ b/configs/pjrc-8051/src/Makefile
@ -67,9 +67,8 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend

 clean:
-	rm -f libboard$(LIBEXT)
-	rm -f *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
 	rm -f Make.dep .depend
--- a/configs/sim/Make.defs
+++ b/configs/sim/Make.defs
@ -83,6 +83,10 @@ define ARCHIVE
 	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
 endef

+define CLEAN
+	@rm -f *.o *.a
+endef
+
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh

 HOSTCC			= gcc
--- a/configs/sim/src/Makefile
+++ b/configs/sim/src/Makefile
@ -65,8 +65,8 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend

 clean:
-	rm -f libboard$(LIBEXT) *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
 	rm -f Make.dep .depend
--- a/configs/z16f2800100zcog/Make.defs
+++ b/configs/z16f2800100zcog/Make.defs
@ -131,6 +131,10 @@ define ARCHIVE
 	$(AR) $(ARFLAGS) $1=-+$2 || { echo "$(AR) $1=-+$2 FAILED!" ; exit 1 ; }
 endef

+define CLEAN
+	@rm -f *.obj *.src *.lib *.hex
+endef
+
 # This is the tool to use for dependencies (i.e., none)

 MKDEP			= $(TOPDIR)/tools/mknulldeps.sh
--- a/configs/z16f2800100zcog/src/Makefile
+++ b/configs/z16f2800100zcog/src/Makefile
@ -70,8 +70,8 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend

 clean:
-	rm -f libboard$(LIBEXT) *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
 	rm -f Make.dep .depend
--- a/configs/z80sim/Make.defs
+++ b/configs/z80sim/Make.defs
@ -82,6 +82,10 @@ define ARCHIVE
 	$(AR) $1 $2 || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; }
 endef

+define CLEAN
+	@rm -f *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex
+endef
+
 MKDEP			= $(TOPDIR)/tools/mkdeps.sh

 HOSTCC			= gcc
--- a/configs/z80sim/src/Makefile
+++ b/configs/z80sim/src/Makefile
@ -67,9 +67,8 @@ libboard$(LIBEXT): $(OBJS)
 depend: .depend

 clean:
-	rm -f libboard$(LIBEXT)
-	rm -f *.asm *.rel *.lst *.rst *.sym *.adb *.lnk *.map *.mem *.ihx *.hex *~
-	if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
+	@rm -f libboard$(LIBEXT) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
 	rm -f Make.dep .depend
--- a/drivers/Makefile
+++ b/drivers/Makefile
@ -80,9 +80,10 @@ endif
 depend: .depend

 clean:
-	rm -f $(BIN) *.o *.obj *.rel *.asm *.lst *.sym *.adb *~
+	@rm -f $(BIN) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
-	rm -f Make.dep .depend
+	@rm -f Make.dep .depend

 -include Make.dep
--- a/examples/mount/Makefile
+++ b/examples/mount/Makefile
@ -66,9 +66,10 @@ $(BIN):	$(OBJS)
 depend: .depend

 clean:
-	rm -f $(BIN) *.o *.obj *.rel *.asm *.lst *.sym *.adb *~
+	@rm -f $(BIN) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
-	rm -f Make.dep .depend
+	@rm -f Make.dep .depend

 -include Make.dep
--- a/examples/nettest/Makefile
+++ b/examples/nettest/Makefile
@ -97,9 +97,10 @@ $(HOST_BIN):	$(HOST_OBJS)
 depend: .depend

 clean:
-	rm -f $(TARG_BIN) $(HOST_BIN) *.o *.obj *.rel *.asm *.lst *.sym *.adb *~
+	@rm -f $(TARG_BIN) $(HOST_BIN) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
-	rm -f Make.dep .depend
+	@rm -f Make.dep .depend

 -include Make.dep
--- a/examples/nsh/Makefile
+++ b/examples/nsh/Makefile
@ -79,9 +79,10 @@ $(BIN):	$(OBJS)
 depend: .depend

 clean:
-	rm -f $(BIN) *.o *.obj *.rel *.asm *.lst *.sym *.adb *~
+	@rm -f $(BIN) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
-	rm -f Make.dep .depend
+	@rm -f Make.dep .depend

 -include Make.dep
--- a/examples/null/Makefile
+++ b/examples/null/Makefile
@ -66,9 +66,10 @@ $(BIN):	$(OBJS)
 depend: .depend

 clean:
-	rm -f $(BIN) *.o *.obj *.rel *.asm *.lst *.sym *.adb *~
+	@rm -f $(BIN) *~ .*.swp
+	$(call CLEAN)

 distclean: clean
-	rm -f Make.dep .depend
+	@rm -f Make.dep .depend

 -include Make.dep