diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-11 23:44:31 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-11 23:44:31 +0000 |
| commit | 96e153c0d29b1ab3657948e280faa25e864b28c5 (patch) | |
| tree | 121d4fdf55df9d292c0d1d3971b2c5252cf39eaa | |
| parent | dab0480f31b5fe4d778a414f3b60e5c5b536b1bd (diff) | |
| download | nuttx-96e153c0d29b1ab3657948e280faa25e864b28c5.tar.gz nuttx-96e153c0d29b1ab3657948e280faa25e864b28c5.tar.bz2 nuttx-96e153c0d29b1ab3657948e280faa25e864b28c5.zip | |
Correct some issues with last check-in; ez80 still does not build
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5339 42af7a65-404d-4744-a932-0658087f49c3
132 files changed, 780 insertions, 665 deletions
diff --git a/apps/examples/adc/Makefile b/apps/examples/adc/Makefile index 7b5259716..fab1a91ab 100644 --- a/apps/examples/adc/Makefile +++ b/apps/examples/adc/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/buttons/Makefile b/apps/examples/buttons/Makefile index c05043480..780941562 100644 --- a/apps/examples/buttons/Makefile +++ b/apps/examples/buttons/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/can/Makefile b/apps/examples/can/Makefile index d5c7a04ef..35c7538f3 100644 --- a/apps/examples/can/Makefile +++ b/apps/examples/can/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/cdcacm/Makefile b/apps/examples/cdcacm/Makefile index 71cd2f3af..3ffdf82b4 100644 --- a/apps/examples/cdcacm/Makefile +++ b/apps/examples/cdcacm/Makefile @@ -80,7 +80,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -91,7 +91,7 @@ $(COBJS): %$(OBJEXT): %.c context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/composite/Makefile b/apps/examples/composite/Makefile index 80292dbfa..a8563ee61 100644 --- a/apps/examples/composite/Makefile +++ b/apps/examples/composite/Makefile @@ -80,7 +80,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -93,7 +93,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/cxxtest/Makefile b/apps/examples/cxxtest/Makefile index ac70a34f9..a2c29169f 100644 --- a/apps/examples/cxxtest/Makefile +++ b/apps/examples/cxxtest/Makefile @@ -93,7 +93,7 @@ $(CXXOBJS): %$(OBJEXT): %.cxx $(call COMPILEXX, $<, $@) .built: chkcxx $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -105,7 +105,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/dhcpd/Makefile b/apps/examples/dhcpd/Makefile index ceaa3b022..8b39c58d4 100644 --- a/apps/examples/dhcpd/Makefile +++ b/apps/examples/dhcpd/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/discover/Makefile b/apps/examples/discover/Makefile index a3e90399c..f4801c569 100644 --- a/apps/examples/discover/Makefile +++ b/apps/examples/discover/Makefile @@ -77,7 +77,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -89,7 +89,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/elf/Makefile b/apps/examples/elf/Makefile index ab49532c8..1c7ac4a23 100644 --- a/apps/examples/elf/Makefile +++ b/apps/examples/elf/Makefile @@ -75,7 +75,7 @@ $(COBJS): %$(OBJEXT): %.c # generating the source files. really_build: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .built: diff --git a/apps/examples/ftpc/Makefile b/apps/examples/ftpc/Makefile index ca630c814..96ed512e2 100644 --- a/apps/examples/ftpc/Makefile +++ b/apps/examples/ftpc/Makefile @@ -74,7 +74,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built # Register application @@ -88,7 +88,7 @@ context: .context # Create dependencies .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/ftpd/Makefile b/apps/examples/ftpd/Makefile index bf0e435d7..f6bab4f40 100644 --- a/apps/examples/ftpd/Makefile +++ b/apps/examples/ftpd/Makefile @@ -71,7 +71,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -84,7 +84,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/hello/Makefile b/apps/examples/hello/Makefile index dc9c6c25c..a556e6f0f 100644 --- a/apps/examples/hello/Makefile +++ b/apps/examples/hello/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/helloxx/Makefile b/apps/examples/helloxx/Makefile index 63da0bde3..de9b1cf9f 100644 --- a/apps/examples/helloxx/Makefile +++ b/apps/examples/helloxx/Makefile @@ -93,7 +93,7 @@ $(CXXOBJS): %$(OBJEXT): %.cxx $(call COMPILEXX, $<, $@) .built: chkcxx $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -105,7 +105,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/hidkbd/Makefile b/apps/examples/hidkbd/Makefile index bd060d83a..36762825c 100644 --- a/apps/examples/hidkbd/Makefile +++ b/apps/examples/hidkbd/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/igmp/Makefile b/apps/examples/igmp/Makefile index f6a171d49..cf65c41bd 100644 --- a/apps/examples/igmp/Makefile +++ b/apps/examples/igmp/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/json/Makefile b/apps/examples/json/Makefile index 9c3ac61b6..0880193ad 100644 --- a/apps/examples/json/Makefile +++ b/apps/examples/json/Makefile @@ -74,7 +74,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -86,7 +86,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/lcdrw/Makefile b/apps/examples/lcdrw/Makefile index c0b6efb8d..0de93c9e9 100644 --- a/apps/examples/lcdrw/Makefile +++ b/apps/examples/lcdrw/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/mm/Makefile b/apps/examples/mm/Makefile index e73cd9baa..aff99d460 100644 --- a/apps/examples/mm/Makefile +++ b/apps/examples/mm/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/modbus/Makefile b/apps/examples/modbus/Makefile index 78ea568d0..10abd8780 100644 --- a/apps/examples/modbus/Makefile +++ b/apps/examples/modbus/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/mount/Makefile b/apps/examples/mount/Makefile index fd6a4b963..d19f2894a 100644 --- a/apps/examples/mount/Makefile +++ b/apps/examples/mount/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/nettest/Makefile b/apps/examples/nettest/Makefile index 09a7c42dd..979a2391e 100644 --- a/apps/examples/nettest/Makefile +++ b/apps/examples/nettest/Makefile @@ -112,7 +112,7 @@ $(HOST_BIN): $(HOST_OBJS) @$(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@ .built: $(TARG_OBJS) - $(call ARCHIVE, $@, "$(TARG_OBJS)") + $(call ARCHIVE, $(BIN), "$(TARG_OBJS)") @touch .built .context: @@ -124,7 +124,7 @@ endif context: .context .depend: Makefile $(TARG_SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(TARG_SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(TARG_SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/nsh/Makefile b/apps/examples/nsh/Makefile index b0efd9aa1..600ea7090 100644 --- a/apps/examples/nsh/Makefile +++ b/apps/examples/nsh/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/null/Makefile b/apps/examples/null/Makefile index 6234f77ea..baa9ac2c3 100644 --- a/apps/examples/null/Makefile +++ b/apps/examples/null/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/nx/Makefile b/apps/examples/nx/Makefile index 6b670d83d..d8befe558 100644 --- a/apps/examples/nx/Makefile +++ b/apps/examples/nx/Makefile @@ -79,7 +79,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -91,7 +91,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/nxconsole/Makefile b/apps/examples/nxconsole/Makefile index a478e6bde..bbbf67812 100644 --- a/apps/examples/nxconsole/Makefile +++ b/apps/examples/nxconsole/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/nxffs/Makefile b/apps/examples/nxffs/Makefile index 28c869e16..2ae286cd0 100644 --- a/apps/examples/nxffs/Makefile +++ b/apps/examples/nxffs/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/nxflat/Makefile b/apps/examples/nxflat/Makefile index e8a15a859..3a34f1fa3 100644 --- a/apps/examples/nxflat/Makefile +++ b/apps/examples/nxflat/Makefile @@ -73,7 +73,7 @@ headers: @$(MAKE) -C tests TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: diff --git a/apps/examples/nxhello/Makefile b/apps/examples/nxhello/Makefile index 37d76b842..79b169a77 100644 --- a/apps/examples/nxhello/Makefile +++ b/apps/examples/nxhello/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/nximage/Makefile b/apps/examples/nximage/Makefile index f428009a2..0e8c3b0de 100644 --- a/apps/examples/nximage/Makefile +++ b/apps/examples/nximage/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/nxlines/Makefile b/apps/examples/nxlines/Makefile index 2127f1b61..e12e310b8 100644 --- a/apps/examples/nxlines/Makefile +++ b/apps/examples/nxlines/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/nxtext/Makefile b/apps/examples/nxtext/Makefile index ff8f1da69..0510992da 100644 --- a/apps/examples/nxtext/Makefile +++ b/apps/examples/nxtext/Makefile @@ -80,7 +80,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -92,7 +92,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/ostest/Makefile b/apps/examples/ostest/Makefile index e73abfb47..7c4354b1d 100644 --- a/apps/examples/ostest/Makefile +++ b/apps/examples/ostest/Makefile @@ -120,7 +120,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -132,7 +132,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/pashello/Makefile b/apps/examples/pashello/Makefile index c5103f2c6..2e2e428e9 100644 --- a/apps/examples/pashello/Makefile +++ b/apps/examples/pashello/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/pipe/Makefile b/apps/examples/pipe/Makefile index d484d9fd9..8afb29188 100644 --- a/apps/examples/pipe/Makefile +++ b/apps/examples/pipe/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/poll/Makefile b/apps/examples/poll/Makefile index 204acbb5e..1483f5342 100644 --- a/apps/examples/poll/Makefile +++ b/apps/examples/poll/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ # Register application diff --git a/apps/examples/pwm/Makefile b/apps/examples/pwm/Makefile index 4a01293af..beeb25e7c 100644 --- a/apps/examples/pwm/Makefile +++ b/apps/examples/pwm/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -86,7 +86,7 @@ $(COBJS): %$(OBJEXT): %.c context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/qencoder/Makefile b/apps/examples/qencoder/Makefile index 5959d14a3..d6eaaf6cb 100644 --- a/apps/examples/qencoder/Makefile +++ b/apps/examples/qencoder/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/relays/Makefile b/apps/examples/relays/Makefile index 72d2faa95..fdb792773 100644 --- a/apps/examples/relays/Makefile +++ b/apps/examples/relays/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/rgmp/Makefile b/apps/examples/rgmp/Makefile index 74b6c154b..04aab7bbe 100644 --- a/apps/examples/rgmp/Makefile +++ b/apps/examples/rgmp/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/romfs/Makefile b/apps/examples/romfs/Makefile index f82da8fe4..47b08134a 100644 --- a/apps/examples/romfs/Makefile +++ b/apps/examples/romfs/Makefile @@ -86,13 +86,13 @@ romfs_testdir.h : testdir.img @xxd -i $< >$@ || { echo "xxd of $< failed" ; exit 1 ; } .built: romfs_testdir.h $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ # Register application diff --git a/apps/examples/sendmail/Makefile b/apps/examples/sendmail/Makefile index 0949c7f54..b7c4d32dc 100644 --- a/apps/examples/sendmail/Makefile +++ b/apps/examples/sendmail/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ # Register application diff --git a/apps/examples/serloop/Makefile b/apps/examples/serloop/Makefile index 6c5d849e6..8ec7f0759 100644 --- a/apps/examples/serloop/Makefile +++ b/apps/examples/serloop/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ # Register application diff --git a/apps/examples/telnetd/Makefile b/apps/examples/telnetd/Makefile index 960d22163..3371f90c2 100644 --- a/apps/examples/telnetd/Makefile +++ b/apps/examples/telnetd/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/thttpd/Makefile b/apps/examples/thttpd/Makefile index cfdd45a67..4f303c952 100644 --- a/apps/examples/thttpd/Makefile +++ b/apps/examples/thttpd/Makefile @@ -73,13 +73,13 @@ headers: @$(MAKE) -C content TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) .built: headers $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/tiff/Makefile b/apps/examples/tiff/Makefile index fb1fb7d34..c86519fde 100644 --- a/apps/examples/tiff/Makefile +++ b/apps/examples/tiff/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/touchscreen/Makefile b/apps/examples/touchscreen/Makefile index d0bd2dbc7..c82a94b44 100644 --- a/apps/examples/touchscreen/Makefile +++ b/apps/examples/touchscreen/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/udp/Makefile b/apps/examples/udp/Makefile index 07f2ba80b..0aa2aaa09 100644 --- a/apps/examples/udp/Makefile +++ b/apps/examples/udp/Makefile @@ -106,7 +106,7 @@ $(HOST_BIN): $(HOST_OBJS) context: .depend: Makefile $(TARG_SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(TARG_SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(TARG_SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/uip/Makefile b/apps/examples/uip/Makefile index 316e01a16..4b4dfc9d9 100644 --- a/apps/examples/uip/Makefile +++ b/apps/examples/uip/Makefile @@ -70,7 +70,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built httpd_fsdata.c: httpd-fs/* @@ -79,7 +79,7 @@ httpd_fsdata.c: httpd-fs/* context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ epend: .depend diff --git a/apps/examples/usbserial/Makefile b/apps/examples/usbserial/Makefile index 7bca96463..06d4ab298 100644 --- a/apps/examples/usbserial/Makefile +++ b/apps/examples/usbserial/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/usbstorage/Makefile b/apps/examples/usbstorage/Makefile index 9ee03efc0..a5da68ef0 100644 --- a/apps/examples/usbstorage/Makefile +++ b/apps/examples/usbstorage/Makefile @@ -80,7 +80,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -93,7 +93,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/usbterm/Makefile b/apps/examples/usbterm/Makefile index 461a98fa3..16d5d4b53 100644 --- a/apps/examples/usbterm/Makefile +++ b/apps/examples/usbterm/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/watchdog/Makefile b/apps/examples/watchdog/Makefile index 22613aea2..b55a37218 100644 --- a/apps/examples/watchdog/Makefile +++ b/apps/examples/watchdog/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -86,7 +86,7 @@ $(COBJS): %$(OBJEXT): %.c context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/wget/Makefile b/apps/examples/wget/Makefile index ddb7b6bf2..f69ebe71b 100644 --- a/apps/examples/wget/Makefile +++ b/apps/examples/wget/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/wgetjson/Makefile b/apps/examples/wgetjson/Makefile index 9687380e9..73e3ed844 100644 --- a/apps/examples/wgetjson/Makefile +++ b/apps/examples/wgetjson/Makefile @@ -76,7 +76,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -88,7 +88,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/wlan/Makefile b/apps/examples/wlan/Makefile index 83fb94fc5..3d944b54a 100644 --- a/apps/examples/wlan/Makefile +++ b/apps/examples/wlan/Makefile @@ -71,13 +71,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/examples/xmlrpc/Makefile b/apps/examples/xmlrpc/Makefile index 87eae9ed2..6cde609dd 100644 --- a/apps/examples/xmlrpc/Makefile +++ b/apps/examples/xmlrpc/Makefile @@ -77,7 +77,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -89,7 +89,7 @@ endif context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/graphics/tiff/Makefile b/apps/graphics/tiff/Makefile index 84e3a66bd..b98616bfc 100644 --- a/apps/graphics/tiff/Makefile +++ b/apps/graphics/tiff/Makefile @@ -70,13 +70,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/interpreters/ficl/Makefile b/apps/interpreters/ficl/Makefile index 9a1fa7e71..c306f67fa 100644 --- a/apps/interpreters/ficl/Makefile +++ b/apps/interpreters/ficl/Makefile @@ -95,13 +95,13 @@ debug: @#echo "CFLAGS: $(CFLAGS)" .built: debug $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: debug Makefile $(SRCS) - @$(MKDEP) $(ROOT_DEPPATH) $(SRC_DEPPATH) $(FICL_DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOT_DEPPATH) $(SRC_DEPPATH) $(FICL_DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/modbus/Makefile b/apps/modbus/Makefile index 01deedb54..321bf09b5 100644 --- a/apps/modbus/Makefile +++ b/apps/modbus/Makefile @@ -88,7 +88,7 @@ endif .built: $(OBJS) ifeq ($(CONFIG_MODBUS),y) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built endif @@ -96,8 +96,7 @@ context: .depend: Makefile $(SRCS) ifeq ($(CONFIG_MODBUS),y) - @$(MKDEP) $(DEPPATH) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ endif diff --git a/apps/namedapp/Makefile b/apps/namedapp/Makefile index 29ae343fb..ce16376ae 100644 --- a/apps/namedapp/Makefile +++ b/apps/namedapp/Makefile @@ -55,9 +55,9 @@ SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) ifeq ($(WINTOOL),y) - BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" + BIN = ..\\libapps$(LIBEXT) else - BIN = "$(APPDIR)/libapps$(LIBEXT)" + BIN = ../libapps$(LIBEXT) endif ROOTDEPPATH = --dep-path . @@ -75,30 +75,30 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") - @touch .built + $(call ARCHIVE, $(BIN), "$(OBJS)") + $(Q) touch .built .context: @echo "/* List of application requirements, generated during make context. */" > namedapp_list.h @echo "/* List of application entry points, generated during make context. */" > namedapp_proto.h - @touch $@ + $(Q) touch $@ context: .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 + $(Q) rm -f *.o *~ .*.swp .built $(call CLEAN) distclean: clean - @rm -f .context Make.dep .depend - @rm -f namedapp_list.h - @rm -f namedapp_proto.h + $(Q) rm -f .context Make.dep .depend + $(Q) rm -f namedapp_list.h + $(Q) rm -f namedapp_proto.h -include Make.dep diff --git a/apps/netutils/codecs/Makefile b/apps/netutils/codecs/Makefile index 1b7a9aa5c..7bab174de 100644 --- a/apps/netutils/codecs/Makefile +++ b/apps/netutils/codecs/Makefile @@ -68,13 +68,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/netutils/dhcpc/Makefile b/apps/netutils/dhcpc/Makefile index 0207fff00..161d8f68f 100644 --- a/apps/netutils/dhcpc/Makefile +++ b/apps/netutils/dhcpc/Makefile @@ -74,13 +74,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/netutils/dhcpd/Makefile b/apps/netutils/dhcpd/Makefile index cf91c2390..8468153d4 100644 --- a/apps/netutils/dhcpd/Makefile +++ b/apps/netutils/dhcpd/Makefile @@ -74,13 +74,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/netutils/discover/Makefile b/apps/netutils/discover/Makefile index 609365f63..b14d8040b 100644 --- a/apps/netutils/discover/Makefile +++ b/apps/netutils/discover/Makefile @@ -77,13 +77,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/netutils/ftpc/Makefile b/apps/netutils/ftpc/Makefile index 0544ddb1a..33aee9d8e 100644 --- a/apps/netutils/ftpc/Makefile +++ b/apps/netutils/ftpc/Makefile @@ -90,13 +90,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/netutils/ftpd/Makefile b/apps/netutils/ftpd/Makefile index 158159f54..738eba226 100644 --- a/apps/netutils/ftpd/Makefile +++ b/apps/netutils/ftpd/Makefile @@ -74,13 +74,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/netutils/json/Makefile b/apps/netutils/json/Makefile index a0c99a471..1fe14413b 100644 --- a/apps/netutils/json/Makefile +++ b/apps/netutils/json/Makefile @@ -68,13 +68,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/netutils/resolv/Makefile b/apps/netutils/resolv/Makefile index 423397f3f..04ba2d17b 100644 --- a/apps/netutils/resolv/Makefile +++ b/apps/netutils/resolv/Makefile @@ -74,13 +74,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/netutils/smtp/Makefile b/apps/netutils/smtp/Makefile index 01864da3b..27f8e323a 100644 --- a/apps/netutils/smtp/Makefile +++ b/apps/netutils/smtp/Makefile @@ -74,13 +74,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/netutils/telnetd/Makefile b/apps/netutils/telnetd/Makefile index a07a92b62..922fa638d 100644 --- a/apps/netutils/telnetd/Makefile +++ b/apps/netutils/telnetd/Makefile @@ -74,13 +74,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/netutils/tftpc/Makefile b/apps/netutils/tftpc/Makefile index d8fb88ad9..b544da850 100644 --- a/apps/netutils/tftpc/Makefile +++ b/apps/netutils/tftpc/Makefile @@ -76,13 +76,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/netutils/thttpd/Makefile b/apps/netutils/thttpd/Makefile index 38f675043..2f6120f40 100644 --- a/apps/netutils/thttpd/Makefile +++ b/apps/netutils/thttpd/Makefile @@ -106,13 +106,13 @@ cgi-bin/$(SUBDIR_BIN3): cgi-bin cgi-src/$(SUBDIR_BIN3) endif .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/netutils/uiplib/Makefile b/apps/netutils/uiplib/Makefile index 29e569b01..4242c3354 100644 --- a/apps/netutils/uiplib/Makefile +++ b/apps/netutils/uiplib/Makefile @@ -90,13 +90,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/netutils/webclient/Makefile b/apps/netutils/webclient/Makefile index 5fb6a2bb1..c6f9301bf 100644 --- a/apps/netutils/webclient/Makefile +++ b/apps/netutils/webclient/Makefile @@ -74,13 +74,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/netutils/webserver/Makefile b/apps/netutils/webserver/Makefile index 965de73b2..5fdd6b8d7 100644 --- a/apps/netutils/webserver/Makefile +++ b/apps/netutils/webserver/Makefile @@ -81,13 +81,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/netutils/xmlrpc/Makefile b/apps/netutils/xmlrpc/Makefile index 3efdf0778..e8118d7e2 100644 --- a/apps/netutils/xmlrpc/Makefile +++ b/apps/netutils/xmlrpc/Makefile @@ -76,13 +76,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/nshlib/Makefile b/apps/nshlib/Makefile index 46dbdd0b1..a16644c03 100644 --- a/apps/nshlib/Makefile +++ b/apps/nshlib/Makefile @@ -110,14 +110,13 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built context: .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/system/free/Makefile b/apps/system/free/Makefile index 2fe5c455d..3a318a492 100644 --- a/apps/system/free/Makefile +++ b/apps/system/free/Makefile @@ -83,7 +83,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built # Register application @@ -97,7 +97,7 @@ context: .context # Create dependencies .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/system/i2c/Makefile b/apps/system/i2c/Makefile index 074906a6d..3bad93675 100644 --- a/apps/system/i2c/Makefile +++ b/apps/system/i2c/Makefile @@ -73,7 +73,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built .context: @@ -83,8 +83,7 @@ $(COBJS): %$(OBJEXT): %.c context: .context .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/system/install/Makefile b/apps/system/install/Makefile index 6e85bba0c..cf6371092 100644 --- a/apps/system/install/Makefile +++ b/apps/system/install/Makefile @@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built # Register application @@ -98,7 +98,7 @@ context: .context # Create dependencies .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/system/poweroff/Makefile b/apps/system/poweroff/Makefile index 92949d93c..6956755fc 100644 --- a/apps/system/poweroff/Makefile +++ b/apps/system/poweroff/Makefile @@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built # Register application @@ -98,7 +98,7 @@ context: .context # Create dependencies .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/system/ramtron/Makefile b/apps/system/ramtron/Makefile index cb771a9cc..339b99fa9 100644 --- a/apps/system/ramtron/Makefile +++ b/apps/system/ramtron/Makefile @@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built # Register application @@ -98,7 +98,7 @@ context: .context # Create dependencies .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/system/readline/Makefile b/apps/system/readline/Makefile index d5db043ca..471a811a3 100644 --- a/apps/system/readline/Makefile +++ b/apps/system/readline/Makefile @@ -74,7 +74,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built # Context build phase target @@ -84,7 +84,7 @@ context: # Dependency build phase target .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/system/sdcard/Makefile b/apps/system/sdcard/Makefile index 555ca151b..4600cdf68 100644 --- a/apps/system/sdcard/Makefile +++ b/apps/system/sdcard/Makefile @@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built # Register application @@ -98,7 +98,7 @@ context: .context # Create dependencies .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/apps/system/sysinfo/Makefile b/apps/system/sysinfo/Makefile index 2b269deb5..9f317e123 100644 --- a/apps/system/sysinfo/Makefile +++ b/apps/system/sysinfo/Makefile @@ -84,7 +84,7 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) .built: $(OBJS) - $(call ARCHIVE, $@, "$(OBJS)") + $(call ARCHIVE, $(BIN), "$(OBJS)") @touch .built # Register application @@ -98,7 +98,7 @@ context: .context # Create dependencies .depend: Makefile $(SRCS) - @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/nuttx/Makefile b/nuttx/Makefile index 7263489c2..5f7f519f0 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -56,7 +56,7 @@ endif # This define is passed as EXTRADEFINES for kernel-mode builds. It is also passed # during PASS1 (but not PASS2) context and depend targets. -KDEFINE = ${shell $(TOPDIR)/tools/define.sh $(CC) __KERNEL__} +KDEFINE = ${shell $(TOPDIR)/tools/define.sh "$(CC)" __KERNEL__} # Process architecture and board-specific directories diff --git a/nuttx/arch/8051/src/Makefile b/nuttx/arch/8051/src/Makefile index 29204b1ee..8a7aaa937 100644 --- a/nuttx/arch/8051/src/Makefile +++ b/nuttx/arch/8051/src/Makefile @@ -171,7 +171,7 @@ board/libboard$(LIBEXT): pass1.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) board/libboard$(LIBEXT) @echo "LD: $@" - @$(CC) $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \ + @"$(CC)" $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \ $(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@ @rm -f up_mem.h @rm -f up_allocateheap$(OBJEXT) libarch$(LIBEXT) @@ -179,7 +179,7 @@ pass1.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) board/libboard$(LIBE nuttx.hex: up_mem.h $(SDCCLIBDIR)/libmysdcc.lib $(LINKOBJS) @echo "LD: $@" - @$(CC) $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \ + @"$(CC)" $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) $(SDCCPATH) $(LINKOBJS) \ $(LDLIBS) -llibboard$(LIBEXT) $(SDCCLIBS) -o $@ nuttx$(EXEEXT): pass1.hex nuttx.hex @@ -201,7 +201,7 @@ export_head: board/libboard$(LIBEXT) p_head$(OBJEXT) # a PHONY target that just sets upt the up_irqtest build correctly up_irqtest.hex: $(TESTOBJS) - $(CC) $(LDFLAGS) -L. $(SDCCPATH) $(TESTLINKOBJS) $(TESTOBJS) $(TESTEXTRAOBJS) $(SDCCLIBS) -o $@ + "$(CC)" $(LDFLAGS) -L. $(SDCCPATH) $(TESTLINKOBJS) $(TESTOBJS) $(TESTEXTRAOBJS) $(SDCCLIBS) -o $@ irqtest: @$(MAKE) TOPDIR=../../.. up_irqtest.hex @@ -212,7 +212,7 @@ irqtest: @if [ -e board/Makefile ]; then \ $(MAKE) -C board TOPDIR=$(TOPDIR) depend ; \ fi - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/nuttx/arch/arm/src/Makefile b/nuttx/arch/arm/src/Makefile index 1f470a25d..6a1dcd5d1 100644 --- a/nuttx/arch/arm/src/Makefile +++ b/nuttx/arch/arm/src/Makefile @@ -78,32 +78,32 @@ EXTRA_LIBPATHS ?= LINKLIBS ?= ifeq ($(CONFIG_WINDOWS_NATIVE),y) - BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") + BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" +ifdef BOARDMAKE + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}" endif else - BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") + BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") ifeq ($(WINTOOL),y) LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" +ifdef BOARDMAKE + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}" endif else - LIBPATHS += -L"(TOPDIR)/lib" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"$(BOARDDIR)" + LIBPATHS += -L"$(TOPDIR)/lib" +ifdef BOARDMAKE + LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board" endif endif endif LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) -LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" +LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}" GCC_LIBDIR := ${shell dirname $(LIBGCC)} VPATH = chip:common:$(ARCH_SUBDIR) @@ -150,24 +150,24 @@ endif # Dependencies .depend: Makefile chip/Make.defs $(SRCS) -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend endif $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend clean: -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(MAKE) -C board TOPDIR="$(TOPDIR)" clean endif $(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(call CLEAN) distclean: clean -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean endif $(Q) rm -f Make.dep .depend diff --git a/nuttx/arch/avr/src/Makefile b/nuttx/arch/avr/src/Makefile index 866d06e6f..8d9184a5d 100644 --- a/nuttx/arch/avr/src/Makefile +++ b/nuttx/arch/avr/src/Makefile @@ -79,25 +79,25 @@ EXTRA_LIBS ?= LINKLIBS ?= ifeq ($(CONFIG_WINDOWS_NATIVE),y) - BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") + BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" +ifdef BOARDMAKE + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}" endif else - BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") + BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") ifeq ($(WINTOOL),y) LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" +ifdef BOARDMAKE + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}" endif else - LIBPATHS += -L"(TOPDIR)/lib" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"$(BOARDDIR)" + LIBPATHS += -L"$(TOPDIR)/lib" +ifdef BOARDMAKE + LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board" endif endif endif @@ -105,7 +105,7 @@ endif LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) -LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" +LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}" VPATH = chip:common:$(ARCH_SUBDIR) @@ -146,24 +146,24 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) # Dependencies .depend: Makefile chip/Make.defs $(SRCS) -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend endif $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend clean: -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean endif $(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(call CLEAN) distclean: clean -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean endif $(Q) rm -f Make.dep .depend diff --git a/nuttx/arch/hc/src/Makefile b/nuttx/arch/hc/src/Makefile index c6197f47c..e1675d217 100644 --- a/nuttx/arch/hc/src/Makefile +++ b/nuttx/arch/hc/src/Makefile @@ -72,32 +72,32 @@ EXTRA_LIBS ?= LINKLIBS ?= ifeq ($(CONFIG_WINDOWS_NATIVE),y) - BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") + BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" +ifdef BOARDMAKE + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}" endif else - BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") + BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") ifeq ($(WINTOOL),y) LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" +ifdef BOARDMAKE + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}" endif else - LIBPATHS += -L"(TOPDIR)/lib" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"$(BOARDDIR)" + LIBPATHS += -L"$(TOPDIR)/lib" +ifdef BOARDMAKE + LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board" endif endif endif LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) -LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" +LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}" VPATH = chip:common:$(ARCH_SUBDIR) @@ -137,24 +137,24 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) # Dependencies .depend: Makefile chip/Make.defs $(SRCS) -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend endif $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend clean: -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean endif $(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(call CLEAN) distclean: clean -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean endif $(Q) rm -f Make.dep .depend diff --git a/nuttx/arch/mips/src/Makefile b/nuttx/arch/mips/src/Makefile index 27c678036..dd9aa3ed5 100644 --- a/nuttx/arch/mips/src/Makefile +++ b/nuttx/arch/mips/src/Makefile @@ -69,32 +69,32 @@ EXTRA_LIBS ?= LINKLIBS ?= ifeq ($(CONFIG_WINDOWS_NATIVE),y) - BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") + BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" +ifdef BOARDMAKE + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}" endif else - BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") + BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") ifeq ($(WINTOOL),y) LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" +ifdef BOARDMAKE + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}" endif else - LIBPATHS += -L"(TOPDIR)/lib" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"$(BOARDDIR)" + LIBPATHS += -L"$(TOPDIR)/lib" +ifdef BOARDMAKE + LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board" endif endif endif LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) -LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" +LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}" VPATH = chip:common:$(ARCH_SUBDIR) @@ -135,24 +135,24 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) # Dependencies .depend: Makefile chip/Make.defs $(SRCS) -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend endif $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend clean: -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean endif $(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(call CLEAN) distclean: clean -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean endif $(Q) rm -f Make.dep .depend diff --git a/nuttx/arch/rgmp/src/Makefile b/nuttx/arch/rgmp/src/Makefile index e1bfb84c1..d63804156 100644 --- a/nuttx/arch/rgmp/src/Makefile +++ b/nuttx/arch/rgmp/src/Makefile @@ -55,7 +55,7 @@ LINKOBJS = $(LINKSRCS:.c=$(OBJEXT)) LDFLAGS += -T$(RGMPLKSCPT) LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) LDPATHS += -L"$(TOPDIR)/lib -L$(RGMPLIBDIR) -LDLIBS += -lrgmp $(shell $(CC) -print-libgcc-file-name) +LDLIBS += -lrgmp $(shell "$(CC)" -print-libgcc-file-name) all: libarch$(LIBEXT) @@ -90,7 +90,7 @@ export_head: # Dependencies .depend: Makefile $(SRCS) $(LINKSRCS) - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) $(LINKSRCS) >Make.dep + @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) $(LINKSRCS) >Make.dep @touch $@ depend: .depend diff --git a/nuttx/arch/sh/src/Makefile b/nuttx/arch/sh/src/Makefile index 6e6ee5d64..9447606a1 100644 --- a/nuttx/arch/sh/src/Makefile +++ b/nuttx/arch/sh/src/Makefile @@ -55,32 +55,32 @@ EXTRA_LIBS ?= LINKLIBS ?= ifeq ($(CONFIG_WINDOWS_NATIVE),y) - BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") + BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" +ifdef BOARDMAKE + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}" endif else - BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") + BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") ifeq ($(WINTOOL),y) LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" +ifdef BOARDMAKE + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}" endif else - LIBPATHS += -L"(TOPDIR)/lib" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"$(BOARDDIR)" + LIBPATHS += -L"$(TOPDIR)/lib" +ifdef BOARDMAKE + LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board" endif endif endif LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) -LIBGCC = ${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name} +LIBGCC = ${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name} VPATH = chip:common @@ -102,7 +102,7 @@ board/libboard$(LIBEXT): nuttx: $(HEAD_OBJ) board/libboard$(LIBEXT) @echo "LD: nuttx" - $(Q) $(LD) --entry=__start $(LDFLAGS) $(LDPATHS) -L$(BOARDDIR) -o $(TOPDIR)/$@ $(HEAD_OBJ) \ + $(Q) $(LD) --entry=__start $(LDFLAGS) $(LDPATHS) -L$(BOARDMAKE) -o $(TOPDIR)/$@ $(HEAD_OBJ) \ --start-group $(LDLIBS) -lboard $(EXTRA_LIBS) $(LIBGCC) --end-group $(Q) $(NM) $(TOPDIR)/$@ | \ grep -v '\(compiled\)\|\(\$(OBJEXT)$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ @@ -121,23 +121,23 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) # Dependencies .depend: Makefile chip/Make.defs $(SRCS) -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend endif - $(Q) $(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend clean: -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean endif $(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(call CLEAN) distclean: clean -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean endif $(Q) rm -f Make.dep .depend diff --git a/nuttx/arch/sim/src/Makefile b/nuttx/arch/sim/src/Makefile index 8cccd0799..4841abd50 100644 --- a/nuttx/arch/sim/src/Makefile +++ b/nuttx/arch/sim/src/Makefile @@ -127,8 +127,8 @@ endif # Most are provided by LINKLIBS on the MAKE command line LINKLIBS ?= -LIBPATHS += -L"(TOPDIR)/lib" -LIBPATHS += -L"$(BOARDDIR)" +LIBPATHS += -L"$(TOPDIR)/lib" +LIBPATHS += -Lboard LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) # Add the board-specific library and directory @@ -150,7 +150,7 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(HOSTOBJS): %$(OBJEXT): %.c $(Q) echo "CC: $<" - $(Q) $(CC) -c $(HOSTCFLAGS) $< -o $@ + $(Q) "$(CC)" -c $(HOSTCFLAGS) $< -o $@ # The architecture-specific library @@ -186,7 +186,7 @@ nuttx.rel : libarch$(LIBEXT) board/libboard$(LIBEXT) $(HOSTOS)-names.dat $(LINKO nuttx$(EXEEXT): cleanrel nuttx.rel $(HOSTOBJS) $(Q) echo "LD: nuttx$(EXEEXT)" - $(Q) $(CC) $(CCLINKFLAGS) $(LDPATHS) -o $(TOPDIR)/$@ nuttx.rel $(HOSTOBJS) $(DRVLIB) $(STDLIBS) + $(Q) "$(CC)" $(CCLINKFLAGS) $(LDPATHS) -o $(TOPDIR)/$@ nuttx.rel $(HOSTOBJS) $(DRVLIB) $(STDLIBS) $(Q) $(NM) $(TOPDIR)/$@ | \ grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ sort > $(TOPDIR)/System.map @@ -202,7 +202,7 @@ export_head: board/libboard$(LIBEXT) up_head.o $(HOSTOBJS) # Dependencies .depend: Makefile $(SRCS) - $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend diff --git a/nuttx/arch/x86/src/Makefile b/nuttx/arch/x86/src/Makefile index 11bd3091d..a979593ee 100644 --- a/nuttx/arch/x86/src/Makefile +++ b/nuttx/arch/x86/src/Makefile @@ -69,32 +69,32 @@ EXTRA_LIBS ?= LINKLIBS ?= ifeq ($(CONFIG_WINDOWS_NATIVE),y) - BOARDDIR = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") + BOARDMAKE = $(dir "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board\Makefile") LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\lib"}" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" +ifdef BOARDMAKE + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)\arch\$(CONFIG_ARCH)\src\board"}" endif else - BOARDDIR = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") + BOARDMAKE = $(dir "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board/Makefile") ifeq ($(WINTOOL),y) LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"${shell cygpath -w $(BOARDDIR)}" +ifdef BOARDMAKE + LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board"}" endif else - LIBPATHS += -L"(TOPDIR)/lib" -ifneq ($(BOARDDIR),) - LIBPATHS += -L"$(BOARDDIR)" + LIBPATHS += -L"$(TOPDIR)/lib" +ifdef BOARDMAKE + LIBPATHS += -L"$(TOPDIR)/arch/$(CONFIG_ARCH)/src/board" endif endif endif LDLIBS = $(patsubst %.a,%,$(patsubst lib%,-l%,$(LINKLIBS))) -LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}" +LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}" ifeq ($(HOSTOS),FreeBSD) HOST_ARCH = ${shell uname -m 2>/dev/null || echo "Other"} @@ -143,24 +143,24 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) # Dependencies .depend: Makefile chip/Make.defs $(SRCS) -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend endif $(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend clean: -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" clean endif $(Q) rm -f libarch$(LIBEXT) *~ .*.swp $(call CLEAN) distclean: clean -ifneq ($(BOARDDIR),) +ifdef BOARDMAKE $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean endif $(Q) rm -f Make.dep .depend diff --git a/nuttx/arch/z16/src/Makefile b/nuttx/arch/z16/src/Makefile index 9223a0464..f2d09e14f 100644 --- a/nuttx/arch/z16/src/Makefile +++ b/nuttx/arch/z16/src/Makefile @@ -36,7 +36,7 @@ -include $(TOPDIR)/Make.defs -include chip/Make.defs -COMPILER = ${shell basename $(CC)} +COMPILER = ${shell basename "$(CC)"} ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src ifeq ($(COMPILER),zneocc.exe) WARCHSRCDIR := ${shell cygpath -w $(ARCHSRCDIR)} @@ -65,8 +65,6 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) DEPSRCS = $(SSRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board - VPATH = chip:common all: $(HEAD_OBJ) libarch$(LIBEXT) @@ -118,7 +116,7 @@ nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx.linkcmd @if [ -e board/Makefile ]; then \ $(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ fi - @$(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(DEPSRCS) >Make.dep + @$(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep @touch $@ # This is part of the top-level export target diff --git a/nuttx/arch/z80/src/Makefile b/nuttx/arch/z80/src/Makefile index 92759de17..4b02b1f0b 100644 --- a/nuttx/arch/z80/src/Makefile +++ b/nuttx/arch/z80/src/Makefile @@ -42,7 +42,7 @@ ############################################################################ # Compiler-Dependent Make -COMPILER = ${shell basename $(CC)} +COMPILER = ${shell basename "$(CC)"} ifeq ($(COMPILER),sdcc) include Makefile.sdcc else diff --git a/nuttx/arch/z80/src/Makefile.sdcc b/nuttx/arch/z80/src/Makefile.sdcc index 815c52a71..5527bcb55 100644 --- a/nuttx/arch/z80/src/Makefile.sdcc +++ b/nuttx/arch/z80/src/Makefile.sdcc @@ -75,7 +75,7 @@ VPATH = chip:common:board # Libraries -LIBGCC = ${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name} +LIBGCC = ${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name} # Supports dynamic sizing of HEAP. # @@ -97,11 +97,11 @@ $(COBJS): %$(OBJEXT): %.c # This is a kludge to work around some conflicting symbols in libsdcc.lib $(SDCCLIBDIR)/myz80.lib: $(SDCCLIBDIR)/$(SDCCLIB) - @cat $(SDCCLIBDIR)/$(SDCCLIB) | \ + $(Q) cat $(SDCCLIBDIR)/$(SDCCLIB) | \ grep -v alloc | grep -v free | grep -v printf | \ grep -v _str | grep -v _mem | grep -v crt0\.o \ > myz80.lib - @mv -f myz80.lib $(SDCCLIBDIR)/myz80.lib + $(Q) mv -f myz80.lib $(SDCCLIBDIR)/myz80.lib # Create a header file that contains addressing information needed by the code @@ -139,7 +139,7 @@ libarch$(LIBEXT): up_mem.h asm_mem.h $(OBJS) # This builds the libboard library in the board/ subdirectory board/libboard$(LIBEXT): - @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) # This target builds the final executable @@ -149,7 +149,7 @@ pass1.hex: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard @echo "-k $(BOARDDIR)" >>pass1.lnk # Path to board library @echo "-k $(SDCCLIBDIR)" >>pass1.lnk # Path to SDCC z80 library @echo "-l libboard$(LIBEXT)" >>pass1.lnk # Name of board library - @for LIB in $(LINKLIBS); do \ + $(Q) for LIB in $(LINKLIBS); do \ echo "-l $(TOPDIR)/lib/$$LIB" >> pass1.lnk ;\ done @echo "-l myz80.lib" >>pass1.lnk # Name of SDCC z80 library @@ -170,11 +170,11 @@ endif @echo "pass1.hex" >>pass1.lnk # Path to head object @echo "$(HEAD_OBJ)" >>pass1.lnk # Path to head object @echo "-e" >>pass1.lnk # End of script - @$(LD) -f pass1.lnk - @rm -f up_mem.h asm_mem.h - @rm -f up_allocateheap$(OBJEXT) $(HEAD_OBJ) libarch$(LIBEXT) - @$(MAKE) TOPDIR="$(TOPDIR)" libarch$(LIBEXT) - @$(MAKE) TOPDIR="$(TOPDIR)" $(HEAD_OBJ) + $(Q) $(LD) -f pass1.lnk + $(Q) rm -f up_mem.h asm_mem.h + $(Q) rm -f up_allocateheap$(OBJEXT) $(HEAD_OBJ) libarch$(LIBEXT) + $(Q) $(MAKE) TOPDIR="$(TOPDIR)" libarch$(LIBEXT) + $(Q) $(MAKE) TOPDIR="$(TOPDIR)" $(HEAD_OBJ) nuttx.hex: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard$(LIBEXT) @echo "LD: nuttx.hex" @@ -182,7 +182,7 @@ nuttx.hex: up_mem.h asm_mem.h $(SDCCLIBDIR)/myz80.lib $(HEAD_OBJ) board/libboard @echo "-k $(BOARDDIR)" >>nuttx.lnk # Path to board library @echo "-k $(SDCCLIBDIR)" >>nuttx.lnk # Path to SDCC z80 library @echo "-l libboard$(LIBEXT)" >>nuttx.lnk # Name of board library - @for LIB in $(LINKLIBS); do \ + $(Q) for LIB in $(LINKLIBS); do \ echo "-l $(TOPDIR)/lib/$$LIB" >> nuttx.lnk ;\ done @echo "-l myz80.lib" >>nuttx.lnk # Name of SDCC z80 library @@ -203,22 +203,22 @@ endif @echo "nuttx.hex" >>nuttx.lnk # Path to head object @echo "$(HEAD_OBJ)" >>nuttx.lnk # Path to head object @echo "-e" >>nuttx.lnk # End of script - @$(LD) -f nuttx.lnk + $(Q) $(LD) -f nuttx.lnk nuttx$(EXEEXT): pass1.hex nuttx.hex - @rm -f pass1.* - @cp -f nuttx.map $(TOPDIR)/. + $(Q) rm -f pass1.* + $(Q) cp -f nuttx.map $(TOPDIR)/. ifeq ($(EXEEXT),.cmd) sed s/:00000001FF/:00520001AD/ nuttx.hex | \ hex2cmd > $(TOPDIR)/nuttx.cmd else - @packihx nuttx.hex > $(TOPDIR)/nuttx$(EXEEXT) + $(Q) packihx nuttx.hex > $(TOPDIR)/nuttx$(EXEEXT) endif # This is part of the top-level export target export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) - @if [ -d "$(EXPORT_DIR)/startup" ]; then \ + $(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \ cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \ else \ echo "$(EXPORT_DIR)/startup does not exist"; \ @@ -228,25 +228,25 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) # Build dependencies .depend: Makefile up_mem.h asm_mem.h chip/Make.defs $(DEPSRCS) - @if [ -e board/Makefile ]; then \ + $(Q) if [ -e board/Makefile ]; then \ $(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ fi - @$(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(DEPSRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep + $(Q) touch $@ depend: .depend clean: - @if [ -e board/Makefile ]; then \ + $(Q) if [ -e board/Makefile ]; then \ $(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \ fi - @rm -f libarch$(LIBEXT) up_mem.h asm_mem.h pass1.* nuttx.* *~ .*.swp + $(Q) rm -f libarch$(LIBEXT) up_mem.h asm_mem.h pass1.* nuttx.* *~ .*.swp $(call CLEAN) distclean: clean - @if [ -e board/Makefile ]; then \ + $(Q) if [ -e board/Makefile ]; then \ $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \ fi - @rm -f Make.dep .depend + $(Q) rm -f Make.dep .depend -include Make.dep diff --git a/nuttx/arch/z80/src/Makefile.zdsii b/nuttx/arch/z80/src/Makefile.zdsii index 031d4fe3d..4eaad3c32 100644 --- a/nuttx/arch/z80/src/Makefile.zdsii +++ b/nuttx/arch/z80/src/Makefile.zdsii @@ -41,7 +41,7 @@ USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common' INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) CPPFLAGS += -I$(ARCHSRCDIR) -I$(ZDSSTDINCDIR) -I$(ZDSZILOGINCDIR) -LDFLAGS += @"${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}" +LDFLAGS += "${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}" ############################################################################ # Files and directories @@ -75,9 +75,9 @@ all: $(HEAD_OBJ) libarch$(LIBEXT) .PHONY: board/libboard$(LIBEXT) $(HEAD_GENSRC) $(GENSRCS) : %$(ASMEXT): %.S - @$(CPP) $(CPPFLAGS) $< -o $@.tmp - @cat $@.tmp | sed -e "s/^#/;/g" > $@ - @rm $@.tmp + $(Q) $(CPP) $(CPPFLAGS) $< -o $@.tmp + $(Q) cat $@.tmp | sed -e "s/^#/;/g" > $@ + $(Q) rm $@.tmp $(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %$(ASMEXT) $(call ASSEMBLE, $<, $@) @@ -89,13 +89,13 @@ libarch$(LIBEXT): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") board/libboard$(LIBEXT): - @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) + $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) nuttx.linkcmd: $(LINKCMDTEMPLATE) - @cp -f $(LINKCMDTEMPLATE) nuttx.linkcmd + $(Q) cp -f $(LINKCMDTEMPLATE) nuttx.linkcmd @echo "\"${shell cygpath -w $(TOPDIR)/nuttx}\"= \\" >>nuttx.linkcmd @echo " \"${shell cygpath -w $(ARCHSRCDIR)/$(HEAD_OBJ)}\", \\" >>nuttx.linkcmd - @( for lib in $(LINKLIBS); do \ + $(Q) ( for lib in $(LINKLIBS); do \ echo " \"`cygpath -w $(TOPDIR)/$${lib}`\", \\" >>nuttx.linkcmd; \ done ; ) @echo " \"${shell cygpath -w $(ARCHSRCDIR)/board/libboard$(LIBEXT)}\", \\" >>nuttx.linkcmd @@ -123,19 +123,19 @@ endif nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx.linkcmd @echo "LD: nuttx.hex" - @$(LD) $(LDFLAGS) + $(Q) $(LD) $(LDFLAGS) .depend: Makefile chip/Make.defs $(DEPSRCS) - @if [ -e board/Makefile ]; then \ + $(Q) if [ -e board/Makefile ]; then \ $(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ fi - @$(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(DEPSRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep + $(Q) touch $@ # This is part of the top-level export target export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) - @if [ -d "$(EXPORT_DIR)/startup" ]; then \ + $(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \ cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \ else \ echo "$(EXPORT_DIR)/startup does not exist"; \ @@ -147,17 +147,17 @@ export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) depend: .depend clean: - @if [ -e board/Makefile ]; then \ + $(Q) if [ -e board/Makefile ]; then \ $(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \ fi - @rm -f libarch$(LIBEXT) *~ .*.swp - @rm -f nuttx.linkcmd *.asm *.tmp *.map + $(Q) rm -f libarch$(LIBEXT) *~ .*.swp + $(Q) rm -f nuttx.linkcmd *.asm *.tmp *.map $(call CLEAN) distclean: clean - @if [ -e board/Makefile ]; then \ + $(Q) if [ -e board/Makefile ]; then \ $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \ fi - @rm -f Make.dep .depend + $(Q) rm -f Make.dep .depend -include Make.dep diff --git a/nuttx/binfmt/Makefile b/nuttx/binfmt/Makefile index 68f671ce6..365997be8 100644 --- a/nuttx/binfmt/Makefile +++ b/nuttx/binfmt/Makefile @@ -81,7 +81,7 @@ $(BIN): $(BINFMT_OBJS) $(call ARCHIVE, $@, "$(BINFMT_OBJS)") .depend: Makefile $(BINFMT_SRCS) - $(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(BINFMT_SRCS) >Make.dep + $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(BINFMT_SRCS) >Make.dep $(Q) touch $@ depend: .depend diff --git a/nuttx/configs/ez80f910200kitg/ostest/Make.defs b/nuttx/configs/ez80f910200kitg/ostest/Make.defs index b7b4e2378..0914bc17a 100644 --- a/nuttx/configs/ez80f910200kitg/ostest/Make.defs +++ b/nuttx/configs/ez80f910200kitg/ostest/Make.defs @@ -38,23 +38,33 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSVERSION := 4.11.1 -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSVERSION := 5.1.1 +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -140,35 +150,35 @@ HEXEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lod *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/ez80f910200kitg/src/Makefile b/nuttx/configs/ez80f910200kitg/src/Makefile index 34ac4ba9c..8a9d94e47 100644 --- a/nuttx/configs/ez80f910200kitg/src/Makefile +++ b/nuttx/configs/ez80f910200kitg/src/Makefile @@ -67,7 +67,7 @@ libboard$(LIBEXT): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/nuttx/configs/ez80f910200zco/dhcpd/Make.defs b/nuttx/configs/ez80f910200zco/dhcpd/Make.defs index 17ac71f07..59f32fb45 100644 --- a/nuttx/configs/ez80f910200zco/dhcpd/Make.defs +++ b/nuttx/configs/ez80f910200zco/dhcpd/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/dhcpd/Make.defs # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -38,23 +38,33 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSVERSION := 4.11.1 -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSVERSION := 5.1.1 +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -140,35 +150,35 @@ HEXEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lod *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/ez80f910200zco/dhcpd/setenv.sh b/nuttx/configs/ez80f910200zco/dhcpd/setenv.sh index 3d1c4aecb..75e873a7f 100755 --- a/nuttx/configs/ez80f910200zco/dhcpd/setenv.sh +++ b/nuttx/configs/ez80f910200zco/dhcpd/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/ez80f910200zco/dhcpd/setenv.sh # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -42,11 +42,11 @@ fi # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # attempts to set the PATH variable do not have the desired effect. # Instead, alias are provided for all of the ZDS-II command line tools. -# Version 4.10.1 installed in the default location is assumed here. +# Version 5.1.1 installed in the default location is assumed here. # -ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" -alias ez8asm="${ZDSBINDIR}/ez8asm.exe" -alias ez8cc="${ZDSBINDIR}/ez8cc.exe" -alias ez8lib="${ZDSBINDIR}/ez8lib.exe" -alias ez8link="${ZDSBINDIR}/ez8link.exe" +ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin" +alias ez80asm="${ZDSBINDIR}/ez80asm.exe" +alias ez80cc="${ZDSBINDIR}/ez80cc.exe" +alias ez80lib="${ZDSBINDIR}/ez80lib.exe" +alias ez80link="${ZDSBINDIR}/ez80link.exe" diff --git a/nuttx/configs/ez80f910200zco/httpd/Make.defs b/nuttx/configs/ez80f910200zco/httpd/Make.defs index 399d3a4c2..615939026 100644 --- a/nuttx/configs/ez80f910200zco/httpd/Make.defs +++ b/nuttx/configs/ez80f910200zco/httpd/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/httpd/Make.defs # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -38,23 +38,33 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSVERSION := 4.11.1 -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSVERSION := 5.1.1 +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -140,35 +150,35 @@ HEXEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lod *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/ez80f910200zco/httpd/setenv.sh b/nuttx/configs/ez80f910200zco/httpd/setenv.sh index 3d1c4aecb..75e873a7f 100755 --- a/nuttx/configs/ez80f910200zco/httpd/setenv.sh +++ b/nuttx/configs/ez80f910200zco/httpd/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/ez80f910200zco/dhcpd/setenv.sh # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -42,11 +42,11 @@ fi # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # attempts to set the PATH variable do not have the desired effect. # Instead, alias are provided for all of the ZDS-II command line tools. -# Version 4.10.1 installed in the default location is assumed here. +# Version 5.1.1 installed in the default location is assumed here. # -ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" -alias ez8asm="${ZDSBINDIR}/ez8asm.exe" -alias ez8cc="${ZDSBINDIR}/ez8cc.exe" -alias ez8lib="${ZDSBINDIR}/ez8lib.exe" -alias ez8link="${ZDSBINDIR}/ez8link.exe" +ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin" +alias ez80asm="${ZDSBINDIR}/ez80asm.exe" +alias ez80cc="${ZDSBINDIR}/ez80cc.exe" +alias ez80lib="${ZDSBINDIR}/ez80lib.exe" +alias ez80link="${ZDSBINDIR}/ez80link.exe" diff --git a/nuttx/configs/ez80f910200zco/nettest/Make.defs b/nuttx/configs/ez80f910200zco/nettest/Make.defs index 3044e8ffd..ea309af75 100644 --- a/nuttx/configs/ez80f910200zco/nettest/Make.defs +++ b/nuttx/configs/ez80f910200zco/nettest/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/nettest/Make.defs # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -38,23 +38,33 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSVERSION := 4.11.1 -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSVERSION := 5.1.1 +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -140,35 +150,35 @@ HEXEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lod *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/ez80f910200zco/nettest/setenv.sh b/nuttx/configs/ez80f910200zco/nettest/setenv.sh index 86823697c..8a0382408 100755 --- a/nuttx/configs/ez80f910200zco/nettest/setenv.sh +++ b/nuttx/configs/ez80f910200zco/nettest/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/ez80f910200zco/nettest/setenv.sh # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -42,11 +42,11 @@ fi # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # attempts to set the PATH variable do not have the desired effect. # Instead, alias are provided for all of the ZDS-II command line tools. -# Version 4.10.1 installed in the default location is assumed here. +# Version 5.1.1 installed in the default location is assumed here. # -ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" -alias ez8asm="${ZDSBINDIR}/ez8asm.exe" -alias ez8cc="${ZDSBINDIR}/ez8cc.exe" -alias ez8lib="${ZDSBINDIR}/ez8lib.exe" -alias ez8link="${ZDSBINDIR}/ez8link.exe" +ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin" +alias ez80asm="${ZDSBINDIR}/ez80asm.exe" +alias ez80cc="${ZDSBINDIR}/ez80cc.exe" +alias ez80lib="${ZDSBINDIR}/ez80lib.exe" +alias ez80link="${ZDSBINDIR}/ez80link.exe" diff --git a/nuttx/configs/ez80f910200zco/nsh/Make.defs b/nuttx/configs/ez80f910200zco/nsh/Make.defs index 469baeb1a..91c900b33 100644 --- a/nuttx/configs/ez80f910200zco/nsh/Make.defs +++ b/nuttx/configs/ez80f910200zco/nsh/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/nst/Make.defs # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -38,23 +38,33 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSVERSION := 4.11.1 -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSVERSION := 5.1.1 +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -140,35 +150,35 @@ HEXEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lod *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/ez80f910200zco/nsh/setenv.sh b/nuttx/configs/ez80f910200zco/nsh/setenv.sh index 37bc6e3aa..8bfe02b2f 100755 --- a/nuttx/configs/ez80f910200zco/nsh/setenv.sh +++ b/nuttx/configs/ez80f910200zco/nsh/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/ez80f910200zco/nst/setenv.sh # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -42,11 +42,11 @@ fi # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # attempts to set the PATH variable do not have the desired effect. # Instead, alias are provided for all of the ZDS-II command line tools. -# Version 4.10.1 installed in the default location is assumed here. +# Version 5.1.1 installed in the default location is assumed here. # -ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" -alias ez8asm="${ZDSBINDIR}/ez8asm.exe" -alias ez8cc="${ZDSBINDIR}/ez8cc.exe" -alias ez8lib="${ZDSBINDIR}/ez8lib.exe" -alias ez8link="${ZDSBINDIR}/ez8link.exe" +ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin" +alias ez80asm="${ZDSBINDIR}/ez80asm.exe" +alias ez80cc="${ZDSBINDIR}/ez80cc.exe" +alias ez80lib="${ZDSBINDIR}/ez80lib.exe" +alias ez80link="${ZDSBINDIR}/ez80link.exe" diff --git a/nuttx/configs/ez80f910200zco/ostest/Make.defs b/nuttx/configs/ez80f910200zco/ostest/Make.defs index c06dfdebe..5cc835612 100644 --- a/nuttx/configs/ez80f910200zco/ostest/Make.defs +++ b/nuttx/configs/ez80f910200zco/ostest/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/ostest/Make.defs # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -38,101 +38,111 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSVERSION := 4.11.1 -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSVERSION := 5.1.1 +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions -ETOPDIR := ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"} -EZDSSTDINCDIR := ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"} -EZDSZILOGINCDIR := ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"} +ETOPDIR := ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"} +EZDSSTDINCDIR := ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"} +EZDSZILOGINCDIR := ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"} # Assembler definitions ifeq ($(CONFIG_ARCH_CHIP_EZ80F91),y) -ARCHCPU = eZ80F91 -ARCHCPUDEF = _EZ80F91 -ARCHFAMILY = _EZ80ACCLAIM! +ARCHCPU = eZ80F91 +ARCHCPUDEF = _EZ80F91 +ARCHFAMILY = _EZ80ACCLAIM! endif ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") - ARCHASMOPTIMIZATION = -debug -NOsdiopt + ARCHASMOPTIMIZATION = -debug -NOsdiopt else - ARCHASMOPTIMIZATION = -nodebug -NOsdiopt + ARCHASMOPTIMIZATION = -nodebug -NOsdiopt endif -ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase -ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet -ARCHASMWARNINGS = -warn -ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__ -ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)' -EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)' -AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \ - $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION) +ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase +ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet +ARCHASMWARNINGS = -warn +ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__ +ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)' +EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)' +AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \ + $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION) # Compiler definitions ifeq ("${CONFIG_DEBUG_SYMBOLS}","y") - ARCHOPTIMIZATION = -debug -reduceopt + ARCHOPTIMIZATION = -debug -reduceopt else - ARCHOPTIMIZATION = -nodebug -optsize + ARCHOPTIMIZATION = -nodebug -optsize endif -ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \ - -asmsw:" $(ARCHASMCPUFLAGS) $(EARCHASMINCLUDES) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)" -ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm -ARCHPICFLAGS = -ARCHWARNINGS = -warn -ARCHDEFINES = -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF) -ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)' -ARCHUSRINCLUDES = -usrinc:'.' -ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES) -CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \ - $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) - -CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__ -CPPINCLUDES = -I$(TOPDIR)/include -CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES) +ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \ + -asmsw:" $(ARCHASMCPUFLAGS) $(EARCHASMINCLUDES) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)" +ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm +ARCHPICFLAGS = +ARCHWARNINGS = -warn +ARCHDEFINES = -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF) +ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)' +ARCHUSRINCLUDES = -usrinc:'.' +ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES) +CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \ + $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) + +CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__ +CPPINCLUDES = -I$(TOPDIR)/include +CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES) # Librarian definitions -ARFLAGS = -quiet -warn +ARFLAGS = -quiet -warn # Linker definitions -LINKCMDTEMPLATE = $(TOPDIR)/configs/ez80f910200zco/ostest/ostest.linkcmd +LINKCMDTEMPLATE = $(TOPDIR)/configs/ez80f910200zco/ostest/ostest.linkcmd # Tool names/pathes -CROSSDEV = -CC = $(ZDSBINDIR)/ez80cc.exe -CPP = gcc -E -LD = $(ZDSBINDIR)/ez80link.exe -AS = $(ZDSBINDIR)/ez80asm.exe -AR = $(ZDSBINDIR)/ez80lib.exe +CROSSDEV = +CC = $(ZDSBINDIR)/ez80cc.exe +CPP = gcc -E +LD = $(ZDSBINDIR)/ez80link.exe +AS = $(ZDSBINDIR)/ez80asm.exe +AR = $(ZDSBINDIR)/ez80lib.exe # File extensions -ASMEXT = .asm -OBJEXT = .obj -LIBEXT = .lib -EXEEXT = .lod -HEXEXT = .hex +ASMEXT = .asm +OBJEXT = .obj +LIBEXT = .lib +EXEEXT = .lod +HEXEXT = .hex # These are the macros that will be used in the NuttX make system # to compile and assembly source files and to insert the resulting @@ -140,49 +150,49 @@ HEXEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lod *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst endef # This is the tool to use for dependencies (i.e., none) -MKDEP = $(TOPDIR)/tools/mknulldeps.sh +MKDEP = $(TOPDIR)/tools/mknulldeps.sh # ZDS-II cannot follow Cygwin soft links, so we will have to use directory copies -DIRLINK = $(TOPDIR)/tools/winlink.sh -DIRUNLINK = $(TOPDIR)/tools/unlink.sh +DIRLINK = $(TOPDIR)/tools/winlink.sh +DIRUNLINK = $(TOPDIR)/tools/unlink.sh # Linux/Cygwin host tool definitions -HOSTCC = gcc -HOSTINCLUDES = -I. -HOSTCFLAGS = -Wall -wstrict-prototypes -Wshadow -g -pipe -HOSTLDFLAGS = +HOSTCC = gcc +HOSTINCLUDES = -I. +HOSTCFLAGS = -Wall -wstrict-prototypes -Wshadow -g -pipe +HOSTLDFLAGS = diff --git a/nuttx/configs/ez80f910200zco/ostest/setenv.sh b/nuttx/configs/ez80f910200zco/ostest/setenv.sh index 028eb6ad4..6150434ef 100755 --- a/nuttx/configs/ez80f910200zco/ostest/setenv.sh +++ b/nuttx/configs/ez80f910200zco/ostest/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/ez80f910200zco/ostest/setenv.sh # -# Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2008, 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -42,11 +42,11 @@ fi # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # attempts to set the PATH variable do not have the desired effect. # Instead, alias are provided for all of the ZDS-II command line tools. -# Version 4.10.1 installed in the default location is assumed here. +# Version 5.1.1 installed in the default location is assumed here. # -ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" -alias ez8asm="${ZDSBINDIR}/ez8asm.exe" -alias ez8cc="${ZDSBINDIR}/ez8cc.exe" -alias ez8lib="${ZDSBINDIR}/ez8lib.exe" -alias ez8link="${ZDSBINDIR}/ez8link.exe" +ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin" +alias ez80asm="${ZDSBINDIR}/ez80asm.exe" +alias ez80cc="${ZDSBINDIR}/ez80cc.exe" +alias ez80lib="${ZDSBINDIR}/ez80lib.exe" +alias ez80link="${ZDSBINDIR}/ez80link.exe" diff --git a/nuttx/configs/ez80f910200zco/poll/Make.defs b/nuttx/configs/ez80f910200zco/poll/Make.defs index fa21c7206..2cd6fa5d3 100644 --- a/nuttx/configs/ez80f910200zco/poll/Make.defs +++ b/nuttx/configs/ez80f910200zco/poll/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ez80f910200zco/poll/Make.defs # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -38,23 +38,33 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSVERSION := 4.11.1 -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSVERSION := 5.1.1 +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -140,35 +150,35 @@ HEXEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lod *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/ez80f910200zco/poll/setenv.sh b/nuttx/configs/ez80f910200zco/poll/setenv.sh index 38252f8f6..1628f105b 100755 --- a/nuttx/configs/ez80f910200zco/poll/setenv.sh +++ b/nuttx/configs/ez80f910200zco/poll/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/ez80f910200zco/poll/setenv.sh # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -42,11 +42,11 @@ fi # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and # attempts to set the PATH variable do not have the desired effect. # Instead, alias are provided for all of the ZDS-II command line tools. -# Version 4.10.1 installed in the default location is assumed here. +# Version 5.1.1 installed in the default location is assumed here. # -ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin" -alias ez8asm="${ZDSBINDIR}/ez8asm.exe" -alias ez8cc="${ZDSBINDIR}/ez8cc.exe" -alias ez8lib="${ZDSBINDIR}/ez8lib.exe" -alias ez8link="${ZDSBINDIR}/ez8link.exe" +ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin" +alias ez80asm="${ZDSBINDIR}/ez80asm.exe" +alias ez80cc="${ZDSBINDIR}/ez80cc.exe" +alias ez80lib="${ZDSBINDIR}/ez80lib.exe" +alias ez80link="${ZDSBINDIR}/ez80link.exe" diff --git a/nuttx/configs/ez80f910200zco/src/Makefile b/nuttx/configs/ez80f910200zco/src/Makefile index fcafd6177..85489fe91 100644 --- a/nuttx/configs/ez80f910200zco/src/Makefile +++ b/nuttx/configs/ez80f910200zco/src/Makefile @@ -74,7 +74,7 @@ libboard$(LIBEXT): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/nuttx/configs/z16f2800100zcog/ostest/Make.defs b/nuttx/configs/z16f2800100zcog/ostest/Make.defs index 7f86dd29f..79fa655bb 100644 --- a/nuttx/configs/z16f2800100zcog/ostest/Make.defs +++ b/nuttx/configs/z16f2800100zcog/ostest/Make.defs @@ -38,23 +38,32 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZNeo-II toolchain is installed -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.1 -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_ZNEO_4.11.1 +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZNeo-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -133,35 +142,35 @@ EXEEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/z16f2800100zcog/pashello/Make.defs b/nuttx/configs/z16f2800100zcog/pashello/Make.defs index 92a67fa65..d7b93d659 100644 --- a/nuttx/configs/z16f2800100zcog/pashello/Make.defs +++ b/nuttx/configs/z16f2800100zcog/pashello/Make.defs @@ -38,18 +38,27 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZNeo-II toolchain is installed -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.11.1 -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_ZNEO_4.11.1 +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog +endif # These are the same directories but with the directory separator # character swapped as needed by the ZNeo-II compiler -WINTOOL := y WTOPDIR := ${shell cygpath -w $(TOPDIR)} WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} @@ -149,13 +158,13 @@ endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif diff --git a/nuttx/configs/z16f2800100zcog/src/Makefile b/nuttx/configs/z16f2800100zcog/src/Makefile index 2de29d8ce..43695f748 100644 --- a/nuttx/configs/z16f2800100zcog/src/Makefile +++ b/nuttx/configs/z16f2800100zcog/src/Makefile @@ -67,7 +67,7 @@ libboard$(LIBEXT): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/nuttx/configs/z8encore000zco/ostest/Make.defs b/nuttx/configs/z8encore000zco/ostest/Make.defs index 23185e2dd..fba101864 100644 --- a/nuttx/configs/z8encore000zco/ostest/Make.defs +++ b/nuttx/configs/z8encore000zco/ostest/Make.defs @@ -38,29 +38,45 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_Z8Encore!_4.10.1 -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_Z8Encore!_4.10.1 + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog +ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y) + ZDSDEVINCDIR := $(ZDSZILOGINCDIR)\Z8Encore_F642X +endif +ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y) + ZDSDEVINCDIR := $(ZDSZILOGINCDIR)\Z8Encore_F640X +endif + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y) -ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F642X + ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F642X endif ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y) -ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F640X + ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F640X +endif + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog endif -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSDEVINCDIR := ${shell cygpath -w $(ZDSDEVINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSDEVINCDIR := ${shell cygpath -w "$(ZDSDEVINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -159,35 +175,35 @@ EXEEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/z8encore000zco/src/Makefile b/nuttx/configs/z8encore000zco/src/Makefile index eee072850..a40b6f42c 100644 --- a/nuttx/configs/z8encore000zco/src/Makefile +++ b/nuttx/configs/z8encore000zco/src/Makefile @@ -67,7 +67,7 @@ libboard$(LIBEXT): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/nuttx/configs/z8f64200100kit/ostest/Make.defs b/nuttx/configs/z8f64200100kit/ostest/Make.defs index 1ee00c72c..4fa6af2ec 100644 --- a/nuttx/configs/z8f64200100kit/ostest/Make.defs +++ b/nuttx/configs/z8f64200100kit/ostest/Make.defs @@ -38,29 +38,45 @@ include ${TOPDIR}/tools/Config.mk # These are the directories where the ZDS-II toolchain is installed -ZDSINSTALLDIR := C:/Program\ Files/ZiLOG/ZDSII_Z8Encore!_4.10.1 -ZDSBINDIR := $(ZDSINSTALLDIR)/bin -ZDSSTDINCDIR := $(ZDSINSTALLDIR)/include/std -ZDSZILOGINCDIR := $(ZDSINSTALLDIR)/include/zilog +ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_Z8Encore!_4.10.1 + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + ZDSBINDIR := $(ZDSINSTALLDIR)\bin + ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std + ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog +ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y) + ZDSDEVINCDIR := $(ZDSZILOGINCDIR)\Z8Encore_F642X +endif +ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y) + ZDSDEVINCDIR := $(ZDSZILOGINCDIR)\Z8Encore_F640X +endif + ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std + ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog +else + WINTOOL := y + INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"} + ZDSBINDIR := $(INSTALLDIR)/bin + ZDSSTDINCDIR := $(INSTALLDIR)/include/std + ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y) -ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F642X + ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F642X endif ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y) -ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F640X + ZDSDEVINCDIR := $(ZDSZILOGINCDIR)/Z8Encore_F640X +endif + ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std + ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog endif -ZDSSTDLIBDIR := $(ZDSINSTALLDIR)/lib/std -ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)/lib/zilog # These are the same directories but with the directory separator # character swapped as needed by the ZDS-II compiler -WINTOOL := y -WTOPDIR := ${shell cygpath -w $(TOPDIR)} -WZDSSTDINCDIR := ${shell cygpath -w $(ZDSSTDINCDIR)} -WZDSZILOGINCDIR := ${shell cygpath -w $(ZDSZILOGINCDIR)} -WZDSDEVINCDIR := ${shell cygpath -w $(ZDSDEVINCDIR)} -WZDSSTDLIBDIR := ${shell cygpath -w $(ZDSSTDLIBDIR)} -WZDSZILOGLIBDIR := ${shell cygpath -w $(ZDSZILOGLIBDIR)} +WTOPDIR := ${shell cygpath -w "$(TOPDIR)"} +WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"} +WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"} +WZDSDEVINCDIR := ${shell cygpath -w "$(ZDSDEVINCDIR)"} +WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"} +WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"} # Escaped versions @@ -159,35 +175,35 @@ EXEEXT = .hex define PREPROCESS @echo "CPP: $1->$2" - @$(CPP) $(CPPFLAGS) $1 -o $2 + $(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2 endef define COMPILE @#echo "CC: $1" - @(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile) endef define ASSEMBLE @#echo "AS: $1" - @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) + $(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile) endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE echo "AR: $2"; - $(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G ) + $(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G ) endef else define ARCHIVE - $(Q) for __obj in $(2); do \ - echo "AR: $(__obj)"; \ - $(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \ + $(Q) for __obj in $(subst ",,$(2)) ; do \ + echo "AR: $$__obj"; \ + "$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \ done endef endif define CLEAN - @rm -f *.obj *.src *.lib *.hex *.lst + $(Q) rm -f *.obj *.src *.lib *.hex *.lst endef # This is the tool to use for dependencies (i.e., none) diff --git a/nuttx/configs/z8f64200100kit/src/Makefile b/nuttx/configs/z8f64200100kit/src/Makefile index 2cd0ed45f..a8b618b6f 100644 --- a/nuttx/configs/z8f64200100kit/src/Makefile +++ b/nuttx/configs/z8f64200100kit/src/Makefile @@ -67,7 +67,7 @@ libboard$(LIBEXT): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/nuttx/drivers/Makefile b/nuttx/drivers/Makefile index a57285505..3a6e34022 100644 --- a/nuttx/drivers/Makefile +++ b/nuttx/drivers/Makefile @@ -105,7 +105,7 @@ $(BIN): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - $(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend diff --git a/nuttx/fs/Makefile b/nuttx/fs/Makefile index 643b322bb..b79b1734d 100644 --- a/nuttx/fs/Makefile +++ b/nuttx/fs/Makefile @@ -124,7 +124,7 @@ $(BIN): $(OBJS) .depend: Makefile $(SRCS) $(Q) $(MKDEP) --dep-path . $(MMAPDEPPATH) $(FATDEPPATH) $(ROMFSDEPPATH) $(NXFFSDEPPATH) $(NFSDEPPATH) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend diff --git a/nuttx/graphics/Makefile b/nuttx/graphics/Makefile index f3a768113..f638587ba 100644 --- a/nuttx/graphics/Makefile +++ b/nuttx/graphics/Makefile @@ -191,7 +191,7 @@ $(BIN): $(OBJS) mklibgraphics: gensources $(BIN) .depend: gensources Makefile $(SRCS) - $(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend diff --git a/nuttx/libc/Makefile b/nuttx/libc/Makefile index 0e11c9bad..ac8fe4bc7 100644 --- a/nuttx/libc/Makefile +++ b/nuttx/libc/Makefile @@ -98,7 +98,7 @@ $(KBIN): uclean .kernlib endif .depend: Makefile $(SRCS) - $(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend diff --git a/nuttx/libxx/Makefile b/nuttx/libxx/Makefile index bdbc5da87..e5fff1c47 100644 --- a/nuttx/libxx/Makefile +++ b/nuttx/libxx/Makefile @@ -99,7 +99,7 @@ $(BIN): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - $(Q) $(MKDEP) $(DEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep + $(Q) $(MKDEP) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend diff --git a/nuttx/mm/Makefile b/nuttx/mm/Makefile index b48d242ff..fef9cc9dd 100644 --- a/nuttx/mm/Makefile +++ b/nuttx/mm/Makefile @@ -64,7 +64,7 @@ $(BIN): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend diff --git a/nuttx/net/Makefile b/nuttx/net/Makefile index 2a4391490..5ce4de4cc 100644 --- a/nuttx/net/Makefile +++ b/nuttx/net/Makefile @@ -104,7 +104,7 @@ $(BIN): $(OBJS) .depend: Makefile $(SRCS) ifeq ($(CONFIG_NET),y) - $(Q) $(MKDEP) --dep-path . --dep-path uip $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) $(MKDEP) --dep-path . --dep-path uip "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep endif $(Q) touch $@ diff --git a/nuttx/sched/Makefile b/nuttx/sched/Makefile index 6487c5701..571393cb2 100644 --- a/nuttx/sched/Makefile +++ b/nuttx/sched/Makefile @@ -199,7 +199,7 @@ $(BIN): $(OBJS) $(call ARCHIVE, $@, "$(OBJS)") .depend: Makefile $(SRCS) - $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend diff --git a/nuttx/syscall/Makefile b/nuttx/syscall/Makefile index e9370a776..0de895cde 100644 --- a/nuttx/syscall/Makefile +++ b/nuttx/syscall/Makefile @@ -79,7 +79,7 @@ $(BIN2): $(STUB_OBJS) .depend: Makefile $(SRCS) $(Q) $(MKDEP) $(ROOTDEPPATH) $(PROXYDEPPATH) $(STUBDEPPATH) \ - $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) touch $@ depend: .depend diff --git a/nuttx/tools/Config.mk b/nuttx/tools/Config.mk index 47131b800..84643b8cc 100644 --- a/nuttx/tools/Config.mk +++ b/nuttx/tools/Config.mk @@ -64,14 +64,14 @@ endef ifeq ($(CONFIG_WINDOWS_NATIVE),y) define ARCHIVE - echo "AR: $2" + @echo "AR: $2" $(AR) $1 - $(AR) $1 $(subst ",,$(2)) + $(Q) $(AR) $1 $(subst ",,$(2)) endef else define ARCHIVE - echo "AR: $2" - $(AR) $1 $(subst ",,$(2)) || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; } + @echo "AR: $2" + $(Q) $(AR) $1 $(subst ",,$(2)) || { echo "$(AR) $1 $2 FAILED!" ; exit 1 ; } endef endif |