From 80f7724816d1b1f07719185fa7fa5f04b9ecb952 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 11 Jul 2011 22:52:51 +0000 Subject: Add an 'export' target to the NuttX top-level Makefile git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3771 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/arch/z16/src/Makefile | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'nuttx/arch/z16/src') diff --git a/nuttx/arch/z16/src/Makefile b/nuttx/arch/z16/src/Makefile index 86ab8d918..56ae6eb54 100644 --- a/nuttx/arch/z16/src/Makefile +++ b/nuttx/arch/z16/src/Makefile @@ -53,7 +53,7 @@ LDFLAGS = @"${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}" endif HEAD_ASRC = $(HEAD_SSRC:.S=$(ASMEXT)) -HEAD_AOBJ = $(HEAD_SSRC:.S=$(OBJEXT)) +HEAD_OBJ = $(HEAD_SSRC:.S=$(OBJEXT)) SSRCS = $(CHIP_SSRCS) $(CMN_SSRCS) ASRCS = $(SSRCS:.S=$(ASMEXT)) @@ -77,10 +77,10 @@ $(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S @cat $@.tmp | sed -e "s/^#/;/g" > $@ @rm $@.tmp -$(AOBJS) $(HEAD_AOBJ): %$(OBJEXT): %$(ASMEXT) +$(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %$(ASMEXT) $(call ASSEMBLE, $<, $@) else -$(OBJS) $(HEAD_AOBJ): %$(OBJEXT): %.S +$(OBJS) $(HEAD_OBJ): %$(OBJEXT): %.S $(call ASSEMBLE, $<, $@) endif @@ -99,7 +99,7 @@ ifeq ($(COMPILER),zneocc.exe) nuttx.linkcmd: $(LINKCMDTEMPLATE) @cp -f $(LINKCMDTEMPLATE) nuttx.linkcmd @echo "\"${shell cygpath -w $(TOPDIR)/nuttx}\"= \\" >>nuttx.linkcmd - @echo " \"${shell cygpath -w $(ARCHSRCDIR)/$(HEAD_AOBJ)}\", \\" >>nuttx.linkcmd + @echo " \"${shell cygpath -w $(ARCHSRCDIR)/$(HEAD_OBJ)}\", \\" >>nuttx.linkcmd @( for lib in $(LINKLIBS); do \ echo " \"`cygpath -w $(TOPDIR)/$${lib}`\", \\" >>nuttx.linkcmd; \ done ; ) @@ -110,7 +110,7 @@ else nuttx.linkcmd: endif -nuttx$(EXEEXT): $(HEAD_AOBJ) board/libboard$(LIBEXT) nuttx.linkcmd +nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx.linkcmd @echo "LD: nuttx.hex" @$(LD) $(LDFLAGS) @@ -121,6 +121,18 @@ nuttx$(EXEEXT): $(HEAD_AOBJ) board/libboard$(LIBEXT) nuttx.linkcmd @$(MKDEP) --dep-path chip --dep-path common $(CC) -- $(CFLAGS) -- $(DEPSRCS) >Make.dep @touch $@ +# This is part of the top-level export target + +export_head: board/libboard$(LIBEXT) $(HEAD_OBJ) + @if [ -d "$(EXPORT_DIR)/startup" ]; then \ + cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \ + else \ + echo "$(EXPORT_DIR)/startup does not exist"; \ + exit 1; \ + fi + +# Dependencies + depend: .depend clean: -- cgit v1.2.3