From 2c5ef5bf85cf0beea5f4bbc7f4abd595ff1bfb12 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 13 Jan 2008 15:31:26 +0000 Subject: [PATCH] Fix Z16F context structure git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@556 42af7a65-404d-4744-a932-0658087f49c3 --- configs/z16f2800100zcog/ostest/Make.defs | 6 +++--- configs/z16f2800100zcog/src/Makefile | 9 +++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/configs/z16f2800100zcog/ostest/Make.defs b/configs/z16f2800100zcog/ostest/Make.defs index 758416249eb..542a1f7212a 100644 --- a/configs/z16f2800100zcog/ostest/Make.defs +++ b/configs/z16f2800100zcog/ostest/Make.defs @@ -125,12 +125,12 @@ EXEEXT = .hex # object files into an archive define COMPILE - @echo "CC: $1" - @$(CC) $(CFLAGS) $1 1>/dev/null + @#echo "CC: $1" + @$(CC) $(CFLAGS) $1 endef define ASSEMBLE - @echo "AS: $1" + @#echo "AS: $1" @$(AS) -c $(AFLAGS) $1 endef diff --git a/configs/z16f2800100zcog/src/Makefile b/configs/z16f2800100zcog/src/Makefile index 85997d0bdad..fa8b5ac2eda 100644 --- a/configs/z16f2800100zcog/src/Makefile +++ b/configs/z16f2800100zcog/src/Makefile @@ -52,11 +52,16 @@ OBJS = $(AOBJS) $(COBJS) all: libboard$(LIBEXT) -$(AOBJS): %$(OBJEXT): %.S +$(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S + @$(CPP) $(CPPFLAGS) $< -o $@.tmp + @cat $@.tmp | sed -e "s/^#/;/g" > $@ + @rm $@.tmp + +$(AOBJS): %$(OBJEXT): %$(ASMEXT) $(call ASSEMBLE, $<, $@) $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c - $(call COMPILE, $<, $@) + $(call COMPILE, `cygpath -w $<`, $@) libboard$(LIBEXT): $(OBJS) @( for obj in $(OBJS) ; do \