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

3 files changed, 41 insertions, 41 deletions

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