diff --git a/ChangeLog b/ChangeLog index df9bb8c6296..9531eb1ac87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -301,3 +301,5 @@ * Began adding support for the Zilog Z16F using the Zilog Z16F2800100ZCOG Development Kit. * Add support toolchains that do not support making of dependencies + * Fix Cygwin build with spaces in directory names + diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index bacd6a6c6d0..67137a66ed4 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -788,6 +788,7 @@ Other memory: * Began adding support for the Zilog Z16F using the Zilog Z16F2800100ZCOG Development Kit. * Add support toolchains that do not support making of dependencies + * Fix Cygwin build with spaces in directory names diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile index e0f73fb0a13..d3347c23c7d 100644 --- a/arch/arm/src/Makefile +++ b/arch/arm/src/Makefile @@ -102,7 +102,7 @@ endif @if [ -e board/Makefile ]; then \ $(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ fi - $(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep @touch $@ depend: .depend diff --git a/arch/c5471/src/Makefile b/arch/c5471/src/Makefile index c9b6229bbd2..8090328545a 100644 --- a/arch/c5471/src/Makefile +++ b/arch/c5471/src/Makefile @@ -77,7 +77,7 @@ $(COBJS): %.o: %.c $(CC) -c $(CFLAGS) $< -o $@ libarch$(LIBEXT): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) @@ -104,9 +104,9 @@ ifeq ($(CONFIG_RRLOAD_BINARY),y) endif .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - $(MAKE) -C board TOPDIR=$(TOPDIR) depend - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MAKE) -C board TOPDIR=$(TOPDIR) depend + @touch $@ depend: .depend diff --git a/arch/dm320/src/Makefile b/arch/dm320/src/Makefile index d9ff513919d..8c031185a43 100644 --- a/arch/dm320/src/Makefile +++ b/arch/dm320/src/Makefile @@ -75,7 +75,7 @@ $(COBJS): %.o: %.c $(CC) -c $(CFLAGS) $< -o $@ libarch$(LIBEXT): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) @@ -105,8 +105,8 @@ endif @if [ -e board/Makefile ]; then \ $(MAKE) -C board TOPDIR=$(TOPDIR) depend ; \ if - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ depend: .depend diff --git a/arch/pjrc-8051/src/Makefile b/arch/pjrc-8051/src/Makefile index 727ef0fdf27..3cd07406bba 100644 --- a/arch/pjrc-8051/src/Makefile +++ b/arch/pjrc-8051/src/Makefile @@ -201,8 +201,8 @@ irqtest: @if [ -e board/Makefile ]; then \ $(MAKE) -C board TOPDIR=$(TOPDIR) depend ; \ fi - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ depend: .depend diff --git a/arch/z80/src/Makefile b/arch/z80/src/Makefile index b1025ed6743..b224a86d577 100644 --- a/arch/z80/src/Makefile +++ b/arch/z80/src/Makefile @@ -224,7 +224,7 @@ nuttx$(EXEEXT): pass1.ihx nuttx.ihx @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 $@ depend: .depend diff --git a/configs/c5471evm/src/Makefile b/configs/c5471evm/src/Makefile index 43f13767ef1..15de1c47697 100644 --- a/configs/c5471evm/src/Makefile +++ b/configs/c5471evm/src/Makefile @@ -57,14 +57,14 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ libboard$(LIBEXT): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ depend: .depend diff --git a/configs/m68332evb/src/Makefile b/configs/m68332evb/src/Makefile index 75af74e3b23..a311e5138c3 100644 --- a/configs/m68332evb/src/Makefile +++ b/configs/m68332evb/src/Makefile @@ -54,14 +54,14 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ libboard$(LIBEXT): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ depend: .depend diff --git a/configs/mcu123-lpc214x/src/Makefile b/configs/mcu123-lpc214x/src/Makefile index 4eb1a367d0a..9aa2cde4da6 100644 --- a/configs/mcu123-lpc214x/src/Makefile +++ b/configs/mcu123-lpc214x/src/Makefile @@ -57,14 +57,14 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ libboard$(LIBEXT): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ depend: .depend diff --git a/configs/ntosd-dm320/src/Makefile b/configs/ntosd-dm320/src/Makefile index 91493c2f927..dadf99845ba 100644 --- a/configs/ntosd-dm320/src/Makefile +++ b/configs/ntosd-dm320/src/Makefile @@ -57,14 +57,14 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ libboard$(LIBEXT): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ depend: .depend diff --git a/configs/pjrc-8051/src/Makefile b/configs/pjrc-8051/src/Makefile index 805003035be..17f5736e9e1 100644 --- a/configs/pjrc-8051/src/Makefile +++ b/configs/pjrc-8051/src/Makefile @@ -56,14 +56,14 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ libboard$(LIBEXT): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ depend: .depend diff --git a/configs/sim/src/Makefile b/configs/sim/src/Makefile index c83c6a03fd1..cd3e852dc99 100644 --- a/configs/sim/src/Makefile +++ b/configs/sim/src/Makefile @@ -54,14 +54,14 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ libboard$(LIBEXT): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ depend: .depend diff --git a/configs/z16f2800100zcog/src/Makefile b/configs/z16f2800100zcog/src/Makefile index be3eedd3106..0091a70b319 100644 --- a/configs/z16f2800100zcog/src/Makefile +++ b/configs/z16f2800100zcog/src/Makefile @@ -64,7 +64,7 @@ libboard$(LIBEXT): $(OBJS) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @touch $@ depend: .depend diff --git a/configs/z80sim/src/Makefile b/configs/z80sim/src/Makefile index 912868e9214..a1b7eab04f2 100644 --- a/configs/z80sim/src/Makefile +++ b/configs/z80sim/src/Makefile @@ -56,14 +56,14 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ libboard$(LIBEXT): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ depend: .depend diff --git a/drivers/Makefile b/drivers/Makefile index f02c8a39534..b14eae2513a 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -65,18 +65,18 @@ $(COBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ $(BIN): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) ifeq ($(CONFIG_NET),y) - $(MKDEP) --dep-path . --dep-path net $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) --dep-path . --dep-path net $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep else - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep endif - touch $@ + @touch $@ depend: .depend diff --git a/examples/mount/Makefile b/examples/mount/Makefile index 20c5a21c32d..7f40b93dbd4 100644 --- a/examples/mount/Makefile +++ b/examples/mount/Makefile @@ -55,14 +55,14 @@ $(COBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ $(BIN): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ depend: .depend diff --git a/examples/nettest/Makefile b/examples/nettest/Makefile index 8d2041a4c22..f71d2ce1350 100644 --- a/examples/nettest/Makefile +++ b/examples/nettest/Makefile @@ -78,7 +78,7 @@ $(TARG_COBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ $(TARG_BIN): $(TARG_OBJS) $(HOST_BIN) - ( for obj in $(TARG_OBJS) ; do \ + @( for obj in $(TARG_OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) @@ -90,8 +90,8 @@ $(HOST_BIN): $(HOST_OBJS) $(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@ .depend: Makefile $(TARG_SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(TARG_SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(TARG_SRCS) >Make.dep + @touch $@ depend: .depend diff --git a/examples/nsh/Makefile b/examples/nsh/Makefile index 91b57dd6635..56f4859c63c 100644 --- a/examples/nsh/Makefile +++ b/examples/nsh/Makefile @@ -68,14 +68,14 @@ $(COBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ $(BIN): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ depend: .depend diff --git a/examples/null/Makefile b/examples/null/Makefile index 7b7b576f6e1..464d0f59db5 100644 --- a/examples/null/Makefile +++ b/examples/null/Makefile @@ -55,14 +55,14 @@ $(COBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ $(BIN): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ depend: .depend diff --git a/examples/ostest/Makefile b/examples/ostest/Makefile index f87e9f3d208..143d331608e 100644 --- a/examples/ostest/Makefile +++ b/examples/ostest/Makefile @@ -85,7 +85,7 @@ $(BIN): $(OBJS) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @touch $@ depend: .depend diff --git a/examples/udp/Makefile b/examples/udp/Makefile index 73f916a1b4b..04f2005cc24 100644 --- a/examples/udp/Makefile +++ b/examples/udp/Makefile @@ -78,7 +78,7 @@ $(TARG_COBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ $(TARG_BIN): $(TARG_OBJS) $(HOST_BIN) - ( for obj in $(TARG_OBJS) ; do \ + @( for obj in $(TARG_OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) @@ -90,8 +90,8 @@ $(HOST_BIN): $(HOST_OBJS) $(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@ .depend: Makefile $(TARG_SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(TARG_SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(TARG_SRCS) >Make.dep + @touch $@ depend: .depend diff --git a/examples/uip/Makefile b/examples/uip/Makefile index 4245c35a56a..f13cf0bab8c 100644 --- a/examples/uip/Makefile +++ b/examples/uip/Makefile @@ -55,14 +55,14 @@ $(COBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ $(BIN): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ depend: .depend diff --git a/fs/Makefile b/fs/Makefile index 14eb5cf3b1e..dfa0a4b9029 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -78,14 +78,14 @@ $(COBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ $(BIN): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ depend: .depend diff --git a/lib/Makefile b/lib/Makefile index cdfacf9ae9d..0489cf7c379 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -52,7 +52,8 @@ STRING_SRCS = lib_memset.c lib_memcpy.c lib_memcmp.c lib_memmove.c \ CTYPE_SRCS = STDIO_SRCS = lib_printf.c lib_rawprintf.c lib_lowprintf.c lib_sprintf.c lib_snprintf.c \ - lib_libsprintf.c lib_vsprintf.c lib_vsnprintf.c lib_libvsprintf.c \ lib_memstream.c lib_lowstream.c lib_nullstream.c lib_sscanf.c + lib_libsprintf.c lib_vsprintf.c lib_vsnprintf.c lib_libvsprintf.c \ + lib_memstream.c lib_lowstream.c lib_nullstream.c lib_sscanf.c ifneq ($(CONFIG_NFILE_DESCRIPTORS),0) STDIO_SRCS += lib_rawstream.c @@ -104,7 +105,7 @@ $(BIN): $(OBJS) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @touch $@ depend: .depend diff --git a/mm/Makefile b/mm/Makefile index 001cdcda599..3d996166485 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -63,7 +63,7 @@ $(BIN): $(OBJS) .depend: Makefile $(SRCS) @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @touch $@ depend: .depend diff --git a/net/Makefile b/net/Makefile index 79621aeb609..2ffb0826f37 100644 --- a/net/Makefile +++ b/net/Makefile @@ -82,16 +82,16 @@ $(COBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ $(BIN): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) ifeq ($(CONFIG_NET),y) - $(MKDEP) --dep-path . --dep-path uip $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) --dep-path . --dep-path uip $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep endif - touch $@ + @touch $@ depend: .depend