From a444a16f4746959a1332cb21749fbdf9a31df091 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 17 Nov 2012 18:54:53 +0000 Subject: 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 --- apps/netutils/codecs/Makefile | 11 ++++++----- apps/netutils/dhcpc/Makefile | 11 ++++++----- apps/netutils/dhcpd/Makefile | 11 ++++++----- apps/netutils/discover/Makefile | 11 ++++++----- apps/netutils/ftpc/Makefile | 11 ++++++----- apps/netutils/ftpd/Makefile | 11 ++++++----- apps/netutils/json/Makefile | 11 ++++++----- apps/netutils/resolv/Makefile | 11 ++++++----- apps/netutils/smtp/Makefile | 11 ++++++----- apps/netutils/telnetd/Makefile | 11 ++++++----- apps/netutils/tftpc/Makefile | 11 ++++++----- apps/netutils/thttpd/Makefile | 25 +++++++++++++------------ apps/netutils/uiplib/Makefile | 11 ++++++----- apps/netutils/webclient/Makefile | 11 ++++++----- apps/netutils/webserver/Makefile | 11 ++++++----- apps/netutils/xmlrpc/Makefile | 11 ++++++----- 16 files changed, 103 insertions(+), 87 deletions(-) (limited to 'apps/netutils') diff --git a/apps/netutils/codecs/Makefile b/apps/netutils/codecs/Makefile index 6dcd94e9b..644a07dec 100644 --- a/apps/netutils/codecs/Makefile +++ b/apps/netutils/codecs/Makefile @@ -73,21 +73,22 @@ $(COBJS): %$(OBJEXT): %.c .built: $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) - @touch .built + $(Q) touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ 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/netutils/dhcpc/Makefile b/apps/netutils/dhcpc/Makefile index 67cad4214..0fe968101 100644 --- a/apps/netutils/dhcpc/Makefile +++ b/apps/netutils/dhcpc/Makefile @@ -79,21 +79,22 @@ $(COBJS): %$(OBJEXT): %.c .built: $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) - @touch .built + $(Q) touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ 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/netutils/dhcpd/Makefile b/apps/netutils/dhcpd/Makefile index 13f121511..359231398 100644 --- a/apps/netutils/dhcpd/Makefile +++ b/apps/netutils/dhcpd/Makefile @@ -79,21 +79,22 @@ $(COBJS): %$(OBJEXT): %.c .built: $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) - @touch .built + $(Q) touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ 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/netutils/discover/Makefile b/apps/netutils/discover/Makefile index 3f5c1f71f..22c06b472 100644 --- a/apps/netutils/discover/Makefile +++ b/apps/netutils/discover/Makefile @@ -82,21 +82,22 @@ $(COBJS): %$(OBJEXT): %.c .built: $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) - @touch .built + $(Q) touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ 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/netutils/ftpc/Makefile b/apps/netutils/ftpc/Makefile index 65c2d59c5..952489550 100644 --- a/apps/netutils/ftpc/Makefile +++ b/apps/netutils/ftpc/Makefile @@ -95,21 +95,22 @@ $(COBJS): %$(OBJEXT): %.c .built: $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) - @touch .built + $(Q) touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ 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/netutils/ftpd/Makefile b/apps/netutils/ftpd/Makefile index 9956bf97f..cccdf548a 100644 --- a/apps/netutils/ftpd/Makefile +++ b/apps/netutils/ftpd/Makefile @@ -79,21 +79,22 @@ $(COBJS): %$(OBJEXT): %.c .built: $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) - @touch .built + $(Q) touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ 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/netutils/json/Makefile b/apps/netutils/json/Makefile index 4a54ab5f7..d8f492aed 100644 --- a/apps/netutils/json/Makefile +++ b/apps/netutils/json/Makefile @@ -73,21 +73,22 @@ $(COBJS): %$(OBJEXT): %.c .built: $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) - @touch .built + $(Q) touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ 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/netutils/resolv/Makefile b/apps/netutils/resolv/Makefile index d9a74989b..c5ec8fff1 100644 --- a/apps/netutils/resolv/Makefile +++ b/apps/netutils/resolv/Makefile @@ -79,21 +79,22 @@ $(COBJS): %$(OBJEXT): %.c .built: $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) - @touch .built + $(Q) touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ 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/netutils/smtp/Makefile b/apps/netutils/smtp/Makefile index d9e6e5c0e..ec3e513b8 100644 --- a/apps/netutils/smtp/Makefile +++ b/apps/netutils/smtp/Makefile @@ -79,21 +79,22 @@ $(COBJS): %$(OBJEXT): %.c .built: $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) - @touch .built + $(Q) touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ 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/netutils/telnetd/Makefile b/apps/netutils/telnetd/Makefile index e024134ff..f614719d5 100644 --- a/apps/netutils/telnetd/Makefile +++ b/apps/netutils/telnetd/Makefile @@ -79,21 +79,22 @@ $(COBJS): %$(OBJEXT): %.c .built: $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) - @touch .built + $(Q) touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ 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/netutils/tftpc/Makefile b/apps/netutils/tftpc/Makefile index 050da06d0..56d3ded12 100644 --- a/apps/netutils/tftpc/Makefile +++ b/apps/netutils/tftpc/Makefile @@ -81,21 +81,22 @@ $(COBJS): %$(OBJEXT): %.c .built: $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) - @touch .built + $(Q) touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ 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/netutils/thttpd/Makefile b/apps/netutils/thttpd/Makefile index a0d5b0ea2..aa053b709 100644 --- a/apps/netutils/thttpd/Makefile +++ b/apps/netutils/thttpd/Makefile @@ -88,44 +88,45 @@ $(COBJS): %$(OBJEXT): %.c ifeq ($(CONFIG_NXFLAT),y) cgi-bin: - @mkdir cgi-bin + $(Q) mkdir cgi-bin cgi-src/$(SUBDIR_BIN1): - @$(MAKE) -C cgi-src $(SUBDIR_BIN1) + $(Q) $(MAKE) -C cgi-src $(SUBDIR_BIN1) cgi-bin/$(SUBDIR_BIN1): cgi-bin cgi-src/$(SUBDIR_BIN1) - @cp -a cgi-src/$(SUBDIR_BIN1) $@ + $(Q) cp -a cgi-src/$(SUBDIR_BIN1) $@ cgi-src/$(SUBDIR_BIN2): - @$(MAKE) -C cgi-src $(SUBDIR_BIN2) + $(Q) $(MAKE) -C cgi-src $(SUBDIR_BIN2) cgi-bin/$(SUBDIR_BIN2): cgi-bin cgi-src/$(SUBDIR_BIN2) - @cp -a cgi-src/$(SUBDIR_BIN2) $@ + $(Q) cp -a cgi-src/$(SUBDIR_BIN2) $@ cgi-src/$(SUBDIR_BIN3): - @$(MAKE) -C cgi-src $(SUBDIR_BIN3) + $(Q) $(MAKE) -C cgi-src $(SUBDIR_BIN3) cgi-bin/$(SUBDIR_BIN3): cgi-bin cgi-src/$(SUBDIR_BIN3) - @cp -a cgi-src/$(SUBDIR_BIN3) $@ + $(Q) cp -a cgi-src/$(SUBDIR_BIN3) $@ endif .built: $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) - @touch .built + $(Q) touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ 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/netutils/uiplib/Makefile b/apps/netutils/uiplib/Makefile index fa9296c0a..d4f73fb83 100644 --- a/apps/netutils/uiplib/Makefile +++ b/apps/netutils/uiplib/Makefile @@ -95,21 +95,22 @@ $(COBJS): %$(OBJEXT): %.c .built: $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) - @touch .built + $(Q) touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ 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/netutils/webclient/Makefile b/apps/netutils/webclient/Makefile index ef9dbd78b..7ade03cb9 100644 --- a/apps/netutils/webclient/Makefile +++ b/apps/netutils/webclient/Makefile @@ -79,21 +79,22 @@ $(COBJS): %$(OBJEXT): %.c .built: $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) - @touch .built + $(Q) touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ 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/netutils/webserver/Makefile b/apps/netutils/webserver/Makefile index 26362be5d..6c5e3d286 100644 --- a/apps/netutils/webserver/Makefile +++ b/apps/netutils/webserver/Makefile @@ -86,21 +86,22 @@ $(COBJS): %$(OBJEXT): %.c .built: $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) - @touch .built + $(Q) touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ 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/netutils/xmlrpc/Makefile b/apps/netutils/xmlrpc/Makefile index 1eb391987..bf7815360 100644 --- a/apps/netutils/xmlrpc/Makefile +++ b/apps/netutils/xmlrpc/Makefile @@ -80,21 +80,22 @@ $(COBJS): %$(OBJEXT): %.c .built: $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) - @touch .built + $(Q) touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ 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 -- cgit v1.2.3