Make logic reorganized for non-GNU toolchain

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@528 42af7a65-404d-4744-a932-0658087f49c3

2 files changed, 50 insertions, 33 deletions

diff --git a/nuttx/configs/z16f2800100zcog/Make.defs b/nuttx/configs/z16f2800100zcog/Make.defs
index d73a05a42..5cf48fa6c 100644
--- a/nuttx/configs/z16f2800100zcog/Make.defs
+++ b/nuttx/configs/z16f2800100zcog/Make.defs
@@ -47,12 +47,12 @@ else
 endif
 
 ARCHASMCPUFLAGS		= -cpu:Z16F2811AL -NOigcase
-ARCHASMLIST			= -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
+ARCHASMLIST		= -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
 ARCHASMWARNINGS		= -warn
-ARCHASMDEFINES		= -define:_Z16F2811AL=1 -define:_Z16K_SERIES=1 -define:_Z16F_SERIES=1
+ARCHASMDEFINES		= -define:_Z16F2811AL=1 -define:_Z16K_SERIES=1 -define:_Z16F_SERIES=1 \ 				  -define:__ASSEMBLY__
 ARCHASMINCLUDES		= -include:$(ZDSINCDIR)/std;$(ZDSINCDIR)/zilog
-AFLAGS				= $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
-					  $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
+AFLAGS			= $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
+			  $(ARCHASMWARN) $(ARCHASMOPTIMIZATION)
 
 ifeq ("${CONFIG_DEBUG}","y")
   ARCHOPTIMIZATION	= -debug -NOregvar -reduceopt
@@ -61,32 +61,49 @@ else
 endif
 
 ARCHCPUFLAGS		= -chartype:S -model:L -NOmodsect -cpu:Z16F2811AL \
-					  -asmsw:" $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)"
-ARCHLIST			= -NOgenprint -keeplst -NOlist -NOlistinc -NOkeepasm
+			  -asmsw:" $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) (ARCHASMWARN) $(ARCHASMOPTIMIZATION)"
+ARCHLIST		= -NOgenprint -keeplst -NOlist -NOlistinc -NOkeepasm
 ARCHPICFLAGS		=
 ARCHWARNINGS		= -warn
-ARCHDEFINES			= -define:_Z16F2811AL -define:_Z16K_SERIES \
-					  -define:_Z16F_SERIES
-ARCHINCLUDES		= -stdinc:"$(ZDSINCDIR)/std;$(ZDSINCDIR)/zilog" \
-					  -usrinc:".;$(TOPDIR)/include"
-CFLAGS				= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
-					  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES)
+ARCHDEFINES		= -define:_Z16F2811AL -define:_Z16K_SERIES \
+			  -define:_Z16F_SERIES -define:
+ARCHSTDINCLUDES		= -stdinc:"$(TOPDIR)/include;$(ZDSINCDIR)/std;$(ZDSINCDIR)/zilog"
+ARCHUSRINCLUDES		= -userinc:"."
+ARCHINCLUDES		= $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
+CCFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES)
+ARFLAGS			= -quiet -warn
 
-CROSSDEV			=
-CC					= $(ZDSBINDIR)/zneocc.exe
-CPP					= $(ZDSBINDIR)/zneoasm.exe
-LD					= $(ZDSBINDIR)/zneolink.exe
-AS					= $(ZDSBINDIR)/zneoasm.exe
-AR					= $(ZDSBINDIR)/czneolib.exe
+CROSSDEV		=
+CC			= $(ZDSBINDIR)/zneocc.exe
+CPP			= $(ZDSBINDIR)/zneoasm.exe
+LD			= $(ZDSBINDIR)/zneolink.exe
+AS			= $(ZDSBINDIR)/zneoasm.exe
+AR			= $(ZDSBINDIR)/zneolib.exe
 
-ASMEXT				= .asm
-OBJEXT				= .obj
-LIBEXT				= .lib
-EXEEXT				= .hex
+ASMEXT			= .asm
+OBJEXT			= .obj
+LIBEXT			= .lib
+EXEEXT			= .hex
 
-HOSTCC				= gcc
-HOSTINCLUDES		= -I.
-HOSTCFLAGS			= -Wall -wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS			=
+define COMPILE
+	@echo "CC: $1"
+	@$(CC) $(CFLAGS) $1
+endef
+
+define ASSEMBLE
+	@echo "AS: $1"
+	@$(AS) -c $(AFLAGS) $1
+endef
+
+define ARCHIVE
+	echo "AR: $2"; \
+	$(AR) $(ARFLAGS) $1=-+$2 || { echo "$(AR) $1=-+$2 FAILED!" ; exit 1 ; }
+endef
 
 MKDEP			= $(TOPDIR)/tools/mknulldeps.sh
+
+HOSTCC			= gcc
+HOSTINCLUDES		= -I.
+HOSTCFLAGS		= -Wall -wstrict-prototypes -Wshadow -g -pipe
+HOSTLDFLAGS		=
diff --git a/nuttx/configs/z16f2800100zcog/src/Makefile b/nuttx/configs/z16f2800100zcog/src/Makefile
index 0091a70b3..c910fb1e2 100644
--- a/nuttx/configs/z16f2800100zcog/src/Makefile
+++ b/nuttx/configs/z16f2800100zcog/src/Makefile
@@ -35,7 +35,10 @@
 
 -include $(TOPDIR)/Make.defs
 
-CFLAGS		+= -I$(TOPDIR)/sched
+ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
+USRINCLUDES	= -userinc:".;$(TOPDIR)/sched;$(ARCH_SRCDIR)/chip;$(ARCH_SRCDIR)/common"
+INCLUDES	= $(ARCHSTDINCLUDES) $(USRINCLUDES)
+CFLAGS		= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES)
 
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
@@ -45,21 +48,18 @@ COBJS		= $(CSRCS:.c=$(OBJEXT))
 SRCS		= $(ASRCS) $(CSRCS)
 OBJS		= $(AOBJS) $(COBJS)
 
-ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-CFLAGS		+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common
 
 all: libboard$(LIBEXT)
 
 $(AOBJS): %$(OBJEXT): %.S
-	$(CC) -c $(CFLAGS) -D__ASSEMBLY__ $< -o $@
+	$(call ASSEMBLE, $<, $@)
 
 $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call COMPILE, $<, $@)
 
 libboard$(LIBEXT): $(OBJS)
 	@( for obj in $(OBJS) ; do \
-		$(AR) $@ $${obj} || \
-			{ echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \
+		$(call ARCHIVE, $@, $${obj}); \
 	done ; )
 
 .depend: Makefile $(SRCS)