diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-10 16:08:08 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-10 16:08:08 +0000 |
commit | cd19f6d867bbe3da36b30f9897aeb3b65e0eee08 (patch) | |
tree | 020cc282cd887dca93dbf617d54816a3669caf13 /apps | |
parent | dbbf70ac72fd2770a5999f116a29d780eae5ce3c (diff) | |
download | nuttx-cd19f6d867bbe3da36b30f9897aeb3b65e0eee08.tar.gz nuttx-cd19f6d867bbe3da36b30f9897aeb3b65e0eee08.tar.bz2 nuttx-cd19f6d867bbe3da36b30f9897aeb3b65e0eee08.zip |
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
Diffstat (limited to 'apps')
49 files changed, 235 insertions, 65 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index e0f8a3989..3a4ca602e 100755 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -15,7 +15,7 @@ the apps/ directory * Moved exec_nuttapp machinery into the nuttapp/ directory. -6.0 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> +6.1 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> * Creation of auto-generated header files now occurs during the context build phase. @@ -23,4 +23,6 @@ * Renamed nuttapp to namedapp * namedapp/binfs.c -- Create a tiny filesystem that can be used to show the internal named apps under /bin. + * Numerous fixes to build system required to support building with native + Windows toolchain. diff --git a/apps/Makefile b/apps/Makefile index 43778e76d..3a6f6204f 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -76,7 +76,7 @@ all: $(BIN) .PHONY: $(BUILTIN_APPS_DIR) context depend clean distclean $(BUILTIN_APPS_DIR): - @$(MAKE) -C $@ TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); + @$(MAKE) -C $@ TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"; $(BIN): $(BUILTIN_APPS_DIR) @( for obj in $(OBJS) ; do \ @@ -86,7 +86,7 @@ $(BIN): $(BUILTIN_APPS_DIR) .context: @for dir in $(BUILTIN_APPS_DIR) ; do \ rm -f $$dir/.context ; \ - $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR) context ; \ + $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" context ; \ done @touch $@ @@ -95,7 +95,7 @@ context: .context .depend: context Makefile $(SRCS) @for dir in $(BUILTIN_APPS_DIR) ; do \ rm -f $$dir/.depend ; \ - $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR) depend ; \ + $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" depend ; \ done @touch $@ @@ -103,14 +103,14 @@ depend: .depend clean: @for dir in $(SUBDIRS) ; do \ - $(MAKE) -C $$dir clean TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \ + $(MAKE) -C $$dir clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"; \ done @rm -f $(BIN) *~ .*.swp *.o $(call CLEAN) distclean: clean @for dir in $(SUBDIRS) ; do \ - $(MAKE) -C $$dir distclean TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \ + $(MAKE) -C $$dir distclean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"; \ done @rm -f .config .context .depend diff --git a/apps/examples/Makefile b/apps/examples/Makefile index b20442d62..de1c5ebed 100644 --- a/apps/examples/Makefile +++ b/apps/examples/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/examples/dhcpd/Makefile b/apps/examples/dhcpd/Makefile index 32b5c4ee5..219cfb865 100644 --- a/apps/examples/dhcpd/Makefile +++ b/apps/examples/dhcpd/Makefile @@ -48,7 +48,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/examples/hello/Makefile b/apps/examples/hello/Makefile index 9b42c2f92..0798c5f90 100644 --- a/apps/examples/hello/Makefile +++ b/apps/examples/hello/Makefile @@ -48,7 +48,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/examples/helloxx/Makefile b/apps/examples/helloxx/Makefile index 3d4545728..eeeae9ef0 100755 --- a/apps/examples/helloxx/Makefile +++ b/apps/examples/helloxx/Makefile @@ -50,7 +50,11 @@ CXXOBJS = $(CXXSRCS:.cxx=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS) OBJS = $(AOBJS) $(COBJS) $(CXXOBJS) -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/examples/hidkbd/Makefile b/apps/examples/hidkbd/Makefile index bb6c8083e..e32e628c7 100644 --- a/apps/examples/hidkbd/Makefile +++ b/apps/examples/hidkbd/Makefile @@ -48,7 +48,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/examples/igmp/Makefile b/apps/examples/igmp/Makefile index 1f31bc006..1e8e96223 100755 --- a/apps/examples/igmp/Makefile +++ b/apps/examples/igmp/Makefile @@ -48,7 +48,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/examples/mm/Makefile b/apps/examples/mm/Makefile index e6d6b14b6..e5d9ffb4c 100644 --- a/apps/examples/mm/Makefile +++ b/apps/examples/mm/Makefile @@ -48,7 +48,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/examples/mount/Makefile b/apps/examples/mount/Makefile index c9e62a71d..7e48ea44a 100644 --- a/apps/examples/mount/Makefile +++ b/apps/examples/mount/Makefile @@ -48,7 +48,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/examples/nettest/Makefile b/apps/examples/nettest/Makefile index 7e17227ef..e9489a6be 100644 --- a/apps/examples/nettest/Makefile +++ b/apps/examples/nettest/Makefile @@ -54,7 +54,11 @@ TARG_COBJS = $(TARG_CSRCS:.c=$(OBJEXT)) TARG_SRCS = $(TARG_ASRCS) $(TARG_CSRCS) TARG_OBJS = $(TARG_AOBJS) $(TARG_COBJS) -TARG_BIN = $(APPDIR)/libapps$(LIBEXT) +ifeq ($(WINTOOL),y) + TARG_BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + TARG_BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif HOSTCFLAGS += -DCONFIG_EXAMPLE_NETTEST_HOST=1 ifeq ($(CONFIG_EXAMPLE_NETTEST_SERVER),y) diff --git a/apps/examples/nsh/Makefile b/apps/examples/nsh/Makefile index 1ec734e82..b5844f9ed 100644 --- a/apps/examples/nsh/Makefile +++ b/apps/examples/nsh/Makefile @@ -48,7 +48,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/examples/null/Makefile b/apps/examples/null/Makefile index eede852dd..3938eb171 100644 --- a/apps/examples/null/Makefile +++ b/apps/examples/null/Makefile @@ -48,7 +48,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/examples/nx/Makefile b/apps/examples/nx/Makefile index bdde6bd29..d0e4c0624 100644 --- a/apps/examples/nx/Makefile +++ b/apps/examples/nx/Makefile @@ -51,7 +51,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/examples/nxflat/Makefile b/apps/examples/nxflat/Makefile index c2fb246bc..d2b99eb13 100644 --- a/apps/examples/nxflat/Makefile +++ b/apps/examples/nxflat/Makefile @@ -48,7 +48,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 . @@ -66,7 +70,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) headers: - @$(MAKE) -C tests TOPDIR=$(TOPDIR) APPDIR=$(APPDIR) CROSSDEV=$(CROSSDEV) + @$(MAKE) -C tests TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) .built: $(OBJS) @( for obj in $(OBJS) ; do \ diff --git a/apps/examples/nxflat/tests/Makefile b/apps/examples/nxflat/tests/Makefile index 31f254218..b5ecc041a 100644 --- a/apps/examples/nxflat/tests/Makefile +++ b/apps/examples/nxflat/tests/Makefile @@ -47,7 +47,7 @@ SYMTAB = $(TESTS_DIR)/symtab.h define DIR_template $(1)_$(2): - @$(MAKE) -C $(1) $(3) TOPDIR=$(TOPDIR) APPDIR=$(APPDIR) ROMFS_DIR=$(ROMFS_DIR) CROSSDEV=$(CROSSDEV) + @$(MAKE) -C $(1) $(3) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" ROMFS_DIR="$(ROMFS_DIR)" CROSSDEV=$(CROSSDEV) endef all: $(ROMFS_HDR) $(ROMFS_DIRLIST) $(SYMTAB) diff --git a/apps/examples/ostest/Makefile b/apps/examples/ostest/Makefile index 361d7eea4..1405a2afb 100644 --- a/apps/examples/ostest/Makefile +++ b/apps/examples/ostest/Makefile @@ -88,7 +88,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/examples/pashello/Makefile b/apps/examples/pashello/Makefile index 7a08eec7f..f392e1b23 100644 --- a/apps/examples/pashello/Makefile +++ b/apps/examples/pashello/Makefile @@ -55,7 +55,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/examples/pipe/Makefile b/apps/examples/pipe/Makefile index 8412babf3..3bcc9b5f7 100644 --- a/apps/examples/pipe/Makefile +++ b/apps/examples/pipe/Makefile @@ -48,7 +48,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/examples/poll/Makefile b/apps/examples/poll/Makefile index 0dc3d9393..1c85d6f36 100644 --- a/apps/examples/poll/Makefile +++ b/apps/examples/poll/Makefile @@ -48,7 +48,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/examples/romfs/Makefile b/apps/examples/romfs/Makefile index f5f90e3b2..1db45765a 100644 --- a/apps/examples/romfs/Makefile +++ b/apps/examples/romfs/Makefile @@ -48,7 +48,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/examples/sendmail/Makefile b/apps/examples/sendmail/Makefile index 6ee90208a..d1552ad34 100644 --- a/apps/examples/sendmail/Makefile +++ b/apps/examples/sendmail/Makefile @@ -48,7 +48,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 . @@ -83,7 +87,7 @@ depend: .depend clean: @rm -f *.o *~ .*.swp .built $(call CLEAN) - @make -f Makefile.host clean TOPDIR=$(TOPDIR) APPDIR=$(APPDIR) + @make -f Makefile.host clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" distclean: clean @rm -f Make.dep .depend diff --git a/apps/examples/serloop/Makefile b/apps/examples/serloop/Makefile index 0caefbef1..67c805d46 100644 --- a/apps/examples/serloop/Makefile +++ b/apps/examples/serloop/Makefile @@ -48,7 +48,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/examples/thttpd/Makefile b/apps/examples/thttpd/Makefile index 4d39d7d17..f58e1c526 100644 --- a/apps/examples/thttpd/Makefile +++ b/apps/examples/thttpd/Makefile @@ -48,7 +48,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 . @@ -66,7 +70,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) headers: - @$(MAKE) -C content TOPDIR=$(TOPDIR) APPDIR=$(APPDIR) CROSSDEV=$(CROSSDEV) + @$(MAKE) -C content TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) .built: headers $(OBJS) @( for obj in $(OBJS) ; do \ @@ -84,7 +88,7 @@ depend: .depend clean: @rm -f *.o *~ .*.swp .built - @make -C content clean TOPDIR=$(TOPDIR) APPDIR=$(APPDIR) CROSSDEV=$(CROSSDEV) + @make -C content clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) $(call CLEAN) distclean: clean diff --git a/apps/examples/thttpd/content/Makefile b/apps/examples/thttpd/content/Makefile index 1a3462c23..8c213a9d5 100644 --- a/apps/examples/thttpd/content/Makefile +++ b/apps/examples/thttpd/content/Makefile @@ -46,7 +46,7 @@ SYMTAB = $(CONTENT_DIR)/symtab.h define DIR_template $(1)_$(2): - @$(MAKE) -C $(1) $(3) TOPDIR=$(TOPDIR) APPDIR=$(APPDIR) CROSSDEV=$(CROSSDEV) CGI_DIR=$(ROMFSCGI_DIR) + @$(MAKE) -C $(1) $(3) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) CGI_DIR="$(ROMFSCGI_DIR)" endef all: $(ROMFS_HDR) $(SYMTAB) diff --git a/apps/examples/udp/Makefile b/apps/examples/udp/Makefile index 30a48baed..8a4458d87 100644 --- a/apps/examples/udp/Makefile +++ b/apps/examples/udp/Makefile @@ -54,7 +54,11 @@ TARG_COBJS = $(TARG_CSRCS:.c=$(OBJEXT)) TARG_SRCS = $(TARG_ASRCS) $(TARG_CSRCS) TARG_OBJS = $(TARG_AOBJS) $(TARG_COBJS) -TARG_BIN = $(APPDIR)/libapps$(LIBEXT) +ifeq ($(WINTOOL),y) + TARG_BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + TARG_BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif HOSTCFLAGS += -DCONFIG_EXAMPLE_UDP_HOST=1 ifeq ($(CONFIG_EXAMPLE_UDP_SERVER),y) diff --git a/apps/examples/uip/Makefile b/apps/examples/uip/Makefile index a712fa70c..bf1d39917 100644 --- a/apps/examples/uip/Makefile +++ b/apps/examples/uip/Makefile @@ -48,7 +48,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/examples/usbserial/Makefile b/apps/examples/usbserial/Makefile index cd6e7599a..35c76ba89 100644 --- a/apps/examples/usbserial/Makefile +++ b/apps/examples/usbserial/Makefile @@ -48,7 +48,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 . @@ -82,7 +86,7 @@ depend: .depend clean: @rm -f *.o *~ .*.swp .built $(call CLEAN) - @$(MAKE) -f Makefile.host clean TOPDIR=$(TOPDIR) APPDIR=$(APPDIR) + @$(MAKE) -f Makefile.host clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" distclean: clean @rm -f Make.dep .depend diff --git a/apps/examples/usbstorage/Makefile b/apps/examples/usbstorage/Makefile index 4b6f36889..39957f141 100644 --- a/apps/examples/usbstorage/Makefile +++ b/apps/examples/usbstorage/Makefile @@ -48,7 +48,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/examples/wget/Makefile b/apps/examples/wget/Makefile index 018b54ceb..7d880bd1e 100644 --- a/apps/examples/wget/Makefile +++ b/apps/examples/wget/Makefile @@ -48,7 +48,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 . @@ -82,7 +86,7 @@ depend: .depend clean: @rm -f *.o *~ .*.swp .built $(call CLEAN) - @make -f Makefile.host clean TOPDIR=$(TOPDIR) APPDIR=$(APPDIR) + @make -f Makefile.host clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" distclean: clean @rm -f Make.dep .depend diff --git a/apps/examples/wlan/Makefile b/apps/examples/wlan/Makefile index 9b161ae66..621d9a0aa 100755 --- a/apps/examples/wlan/Makefile +++ b/apps/examples/wlan/Makefile @@ -49,7 +49,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/namedapp/Makefile b/apps/namedapp/Makefile index 50dedfc39..fba8fb1ff 100644 --- a/apps/namedapp/Makefile +++ b/apps/namedapp/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 . VPATH = 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 . diff --git a/apps/nshlib/Makefile b/apps/nshlib/Makefile index d0efd684c..a838f9589 100644 --- a/apps/nshlib/Makefile +++ b/apps/nshlib/Makefile @@ -73,7 +73,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 . VPATH = diff --git a/apps/vsn/Makefile b/apps/vsn/Makefile index a2dab4dbc..123df2747 100644 --- a/apps/vsn/Makefile +++ b/apps/vsn/Makefile @@ -46,7 +46,7 @@ nothing: .context: @for dir in $(SUBDIRS) ; do \ - $(MAKE) -C $$dir context TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \ + $(MAKE) -C $$dir context TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"; \ done @touch $@ @@ -54,12 +54,12 @@ context: .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 diff --git a/apps/vsn/hello/Makefile b/apps/vsn/hello/Makefile index 80d6a03e9..23e8890c2 100644 --- a/apps/vsn/hello/Makefile +++ b/apps/vsn/hello/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/vsn/poweroff/Makefile b/apps/vsn/poweroff/Makefile index d8badc91c..613681010 100644 --- a/apps/vsn/poweroff/Makefile +++ b/apps/vsn/poweroff/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/vsn/ramtron/Makefile b/apps/vsn/ramtron/Makefile index f53d3503b..d91a6ca1b 100644 --- a/apps/vsn/ramtron/Makefile +++ b/apps/vsn/ramtron/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/vsn/sdcard/Makefile b/apps/vsn/sdcard/Makefile index 5ecedccdf..d943b909d 100644 --- a/apps/vsn/sdcard/Makefile +++ b/apps/vsn/sdcard/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 . |