From 291270beb5f9678fc211ca96ddd3131e0cfae859 Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 10 Jan 2008 18:23:08 +0000 Subject: [PATCH] Using tool-specific clean git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@545 42af7a65-404d-4744-a932-0658087f49c3 --- examples/ostest/Makefile | 5 +++-- examples/udp/Makefile | 5 +++-- examples/uip/Makefile | 5 +++-- fs/Makefile | 5 +++-- lib/Makefile | 5 +++-- mm/Makefile | 6 +++--- mm/Makefile.test | 10 +++++----- net/Makefile | 6 +++--- netutils/Makefile | 10 +++++++--- sched/Makefile | 6 +++--- tools/Makefile.mkconfig | 10 +++++----- 11 files changed, 41 insertions(+), 32 deletions(-) diff --git a/examples/ostest/Makefile b/examples/ostest/Makefile index f473e08d58..05f76f92f0 100644 --- a/examples/ostest/Makefile +++ b/examples/ostest/Makefile @@ -89,9 +89,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 diff --git a/examples/udp/Makefile b/examples/udp/Makefile index 1d3e675909..a4d4fdd5e4 100644 --- a/examples/udp/Makefile +++ b/examples/udp/Makefile @@ -95,9 +95,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 diff --git a/examples/uip/Makefile b/examples/uip/Makefile index 0408b9b7cd..c9b6932d8e 100644 --- a/examples/uip/Makefile +++ b/examples/uip/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 diff --git a/fs/Makefile b/fs/Makefile index ee7a36150b..267f893555 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -89,9 +89,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 diff --git a/lib/Makefile b/lib/Makefile index b2a8f8af0d..a0a4e28072 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -110,9 +110,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 diff --git a/mm/Makefile b/mm/Makefile index e7495b77c7..d4ee105d5c 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -67,11 +67,11 @@ $(BIN): $(OBJS) depend: .depend clean: - rm -f $(BIN) *.asm *.lst *.sym *.adb *~ .*.swp - if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi + @rm -f $(BIN) *~ .*.swp + $(call CLEAN) distclean: clean - rm -f Make.dep .depend + @rm -f Make.dep .depend -include Make.dep diff --git a/mm/Makefile.test b/mm/Makefile.test index 1ff3f9913c..26839de81c 100644 --- a/mm/Makefile.test +++ b/mm/Makefile.test @@ -1,7 +1,7 @@ -############################################################ +############################################################################ # Makefile.test # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,7 +31,7 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ SRCS = mm_test.c mm_initialize.c mm_sem.c mm_addfreechunk.c mm_size2ndx.c mm_shrinkchunk.c \ mm_malloc.c mm_zalloc.c mm_calloc.c mm_realloc.c \ @@ -61,4 +61,4 @@ $(BIN): $(OBJS) $(LD) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ clean: - rm -f $(BIN) *.o1 *~ + @rm -f $(BIN) *.o1 *~ diff --git a/net/Makefile b/net/Makefile index 5124a64ad5..42a02fdf0a 100644 --- a/net/Makefile +++ b/net/Makefile @@ -94,9 +94,9 @@ endif depend: .depend clean: - rm -f $(BIN) *.o *.obj *.rel *.asm *.lst *.sym *.adb *~ - rm -f uip/*~ - if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi + @rm -f $(BIN) *~ .*.swp + @rm -f uip/*~ uip/.*.swp + $(call CLEAN) distclean: clean rm -f Make.dep .depend diff --git a/netutils/Makefile b/netutils/Makefile index 36f03d3b83..73e068500c 100644 --- a/netutils/Makefile +++ b/netutils/Makefile @@ -50,6 +50,8 @@ include resolv/Make.defs endif endif +SUBDIRS = uiplib dhcpc dhcpd resolv smtp telnetd webclient webserver + ASRCS = $(UIPLIB_ASRCS) $(DHCPC_ASRCS) $(DHCPD_ASRCS) $(RESOLV_ASRCS) \ $(SMTP_ASRCS) $(TELNETD_ASRCS) $(WEBCLIENT_ASRCS) $(WEBSERVER_ASRCS) AOBJS = $(ASRCS:.S=$(OBJEXT)) @@ -90,9 +92,11 @@ endif depend: .depend clean: - @rm -f $(BIN) *.o *.obj *.rel *.asm *.lst *.sym *.adb *~ - @rm -f uiplib/*~ dhcpc/*~ dhcpd/*~ resolv/*~ smtp/*~ telnetd/*~ webclient/*~ webserver/*~ - @if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi + @rm -f $(BIN) *~ .*.swp + $(call CLEAN) + @( for dir in $(SUBDIRS); do \ + rm $(dir)/*~ $(dir)/.*.swp; \ + done ; ) @$(MAKE) -C dhcpd -f Makefile.host clean distclean: clean diff --git a/sched/Makefile b/sched/Makefile index 749f1b0a71..f2ba461dfc 100644 --- a/sched/Makefile +++ b/sched/Makefile @@ -159,10 +159,10 @@ $(BIN): $(OBJS) depend: .depend clean: - rm -f $(BIN) *.o *.obj *.rel *.asm *.lst *.sym *.adb *~ - if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi + @rm -f $(BIN) *~ .*.swp + $(call CLEAN) distclean: clean - rm -f Make.dep .depend + @rm -f Make.dep .depend -include Make.dep diff --git a/tools/Makefile.mkconfig b/tools/Makefile.mkconfig index 7f206e0781..42262d2b2a 100644 --- a/tools/Makefile.mkconfig +++ b/tools/Makefile.mkconfig @@ -1,7 +1,7 @@ -############################################################ +############################################################################ # Makefile.mkconfig # -# Copyright (C) 2007 Gregory Nutt. All rights reserved. +# Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# 3. Neither the name Gregory Nutt nor the names of its contributors may be +# 3. Neither the name NuttX nor the names of its contributors may be # used to endorse or promote products derived from this software # without specific prior written permission. # @@ -31,13 +31,13 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. # -############################################################ +############################################################################ all: mkconfig default: mkconfig mkconfig: mkconfig.c - gcc -O2 -Wall -o mkconfig mkconfig.c + @gcc -O2 -Wall -o mkconfig mkconfig.c clean: @rm -f mkconfig mkconfig.exe *~