From cd19f6d867bbe3da36b30f9897aeb3b65e0eee08 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 10 Apr 2011 16:08:08 +0000 Subject: Changes for clean build of app/ directory with Windows toolchain git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3488 42af7a65-404d-4744-a932-0658087f49c3 --- apps/netutils/Makefile | 6 +++--- apps/netutils/dhcpc/Makefile | 6 +++++- apps/netutils/dhcpd/Makefile | 6 +++++- apps/netutils/resolv/Makefile | 6 +++++- apps/netutils/smtp/Makefile | 6 +++++- apps/netutils/telnetd/Makefile | 6 +++++- apps/netutils/tftpc/Makefile | 6 +++++- apps/netutils/thttpd/Makefile | 6 +++++- apps/netutils/uiplib/Makefile | 6 +++++- apps/netutils/webclient/Makefile | 6 +++++- apps/netutils/webserver/Makefile | 6 +++++- 11 files changed, 53 insertions(+), 13 deletions(-) (limited to 'apps/netutils') diff --git a/apps/netutils/Makefile b/apps/netutils/Makefile index d0268698f..7401a8695 100644 --- a/apps/netutils/Makefile +++ b/apps/netutils/Makefile @@ -50,17 +50,17 @@ context: depend: @for dir in $(SUBDIRS) ; do \ - $(MAKE) -C $$dir depend TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \ + $(MAKE) -C $$dir depend TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"; \ done clean: @for dir in $(SUBDIRS) ; do \ - $(MAKE) -C $$dir clean TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \ + $(MAKE) -C $$dir clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"; \ done distclean: clean @for dir in $(SUBDIRS) ; do \ - $(MAKE) -C $$dir distclean TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \ + $(MAKE) -C $$dir distclean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"; \ done -include Make.dep diff --git a/apps/netutils/dhcpc/Makefile b/apps/netutils/dhcpc/Makefile index da390acb3..c69a5bdf4 100644 --- a/apps/netutils/dhcpc/Makefile +++ b/apps/netutils/dhcpc/Makefile @@ -52,7 +52,11 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = $(APPDIR)/libapps$(LIBEXT) +ifeq ($(WINTOOL),y) + BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif ROOTDEPPATH = --dep-path . diff --git a/apps/netutils/dhcpd/Makefile b/apps/netutils/dhcpd/Makefile index a03b24005..24b5bd778 100644 --- a/apps/netutils/dhcpd/Makefile +++ b/apps/netutils/dhcpd/Makefile @@ -52,7 +52,11 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = $(APPDIR)/libapps$(LIBEXT) +ifeq ($(WINTOOL),y) + BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif ROOTDEPPATH = --dep-path . diff --git a/apps/netutils/resolv/Makefile b/apps/netutils/resolv/Makefile index 84857e430..9c822078d 100644 --- a/apps/netutils/resolv/Makefile +++ b/apps/netutils/resolv/Makefile @@ -52,7 +52,11 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = $(APPDIR)/libapps$(LIBEXT) +ifeq ($(WINTOOL),y) + BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif ROOTDEPPATH = --dep-path . diff --git a/apps/netutils/smtp/Makefile b/apps/netutils/smtp/Makefile index 682b3311d..dfad84f91 100644 --- a/apps/netutils/smtp/Makefile +++ b/apps/netutils/smtp/Makefile @@ -52,7 +52,11 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = $(APPDIR)/libapps$(LIBEXT) +ifeq ($(WINTOOL),y) + BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif ROOTDEPPATH = --dep-path . diff --git a/apps/netutils/telnetd/Makefile b/apps/netutils/telnetd/Makefile index 7fb0ffa47..5c2ea0c28 100644 --- a/apps/netutils/telnetd/Makefile +++ b/apps/netutils/telnetd/Makefile @@ -52,7 +52,11 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = $(APPDIR)/libapps$(LIBEXT) +ifeq ($(WINTOOL),y) + BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif ROOTDEPPATH = --dep-path . diff --git a/apps/netutils/tftpc/Makefile b/apps/netutils/tftpc/Makefile index d6a724e79..dc2cbf03c 100644 --- a/apps/netutils/tftpc/Makefile +++ b/apps/netutils/tftpc/Makefile @@ -54,7 +54,11 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = $(APPDIR)/libapps$(LIBEXT) +ifeq ($(WINTOOL),y) + BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif ROOTDEPPATH = --dep-path . diff --git a/apps/netutils/thttpd/Makefile b/apps/netutils/thttpd/Makefile index 963ab514f..5a7d0d852 100644 --- a/apps/netutils/thttpd/Makefile +++ b/apps/netutils/thttpd/Makefile @@ -52,7 +52,11 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = $(APPDIR)/libapps$(LIBEXT) +ifeq ($(WINTOOL),y) + BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif ROOTDEPPATH = --dep-path . diff --git a/apps/netutils/uiplib/Makefile b/apps/netutils/uiplib/Makefile index aed228bde..52b5fe669 100644 --- a/apps/netutils/uiplib/Makefile +++ b/apps/netutils/uiplib/Makefile @@ -61,7 +61,11 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = $(APPDIR)/libapps$(LIBEXT) +ifeq ($(WINTOOL),y) + BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif ROOTDEPPATH = --dep-path . diff --git a/apps/netutils/webclient/Makefile b/apps/netutils/webclient/Makefile index 3174e0ce2..e6a1aa575 100644 --- a/apps/netutils/webclient/Makefile +++ b/apps/netutils/webclient/Makefile @@ -52,7 +52,11 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = $(APPDIR)/libapps$(LIBEXT) +ifeq ($(WINTOOL),y) + BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif ROOTDEPPATH = --dep-path . diff --git a/apps/netutils/webserver/Makefile b/apps/netutils/webserver/Makefile index 545079550..7f44fd8c8 100644 --- a/apps/netutils/webserver/Makefile +++ b/apps/netutils/webserver/Makefile @@ -52,7 +52,11 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = $(APPDIR)/libapps$(LIBEXT) +ifeq ($(WINTOOL),y) + BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif ROOTDEPPATH = --dep-path . -- cgit v1.2.3