diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-11 22:52:51 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-11 22:52:51 +0000 |
commit | 80f7724816d1b1f07719185fa7fa5f04b9ecb952 (patch) | |
tree | 334f014f7d379767c749594dae77d312e99fe1b9 /nuttx/arch/x86 | |
parent | 0ad340ca288ed7dc0ae3b682a410e13c13798d0a (diff) | |
download | px4-nuttx-80f7724816d1b1f07719185fa7fa5f04b9ecb952.tar.gz px4-nuttx-80f7724816d1b1f07719185fa7fa5f04b9ecb952.tar.bz2 px4-nuttx-80f7724816d1b1f07719185fa7fa5f04b9ecb952.zip |
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
Diffstat (limited to 'nuttx/arch/x86')
-rw-r--r-- | nuttx/arch/x86/src/Makefile | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/nuttx/arch/x86/src/Makefile b/nuttx/arch/x86/src/Makefile index b94365276..e0e92eacd 100644 --- a/nuttx/arch/x86/src/Makefile +++ b/nuttx/arch/x86/src/Makefile @@ -53,7 +53,7 @@ else -I$(ARCH_SRCDIR)/$(ARCH_SUBDIR) -I$(TOPDIR)/sched endif -HEAD_AOBJ = $(HEAD_ASRC:.S=$(OBJEXT)) +HEAD_OBJ = $(HEAD_ASRC:.S=$(OBJEXT)) ASRCS = $(CHIP_ASRCS) $(CMN_ASRCS) AOBJS = $(ASRCS:.S=$(OBJEXT)) @@ -85,7 +85,7 @@ VPATH = chip:common:$(ARCH_SUBDIR) all: $(HEAD_OBJ) libarch$(LIBEXT) -$(AOBJS) $(HEAD_AOBJ): %$(OBJEXT): %.S +$(AOBJS) $(HEAD_OBJ): %$(OBJEXT): %.S $(call ASSEMBLE, $<, $@) $(COBJS): %$(OBJEXT): %.c @@ -99,9 +99,9 @@ libarch$(LIBEXT): $(OBJS) board/libboard$(LIBEXT): @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) -nuttx$(EXEEXT): $(HEAD_AOBJ) board/libboard$(LIBEXT) +nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT) @echo "LD: nuttx$(EXEEXT)" - @$(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) -o $(NUTTX)$(EXEEXT) $(HEAD_AOBJ) $(EXTRA_OBJS) \ + @$(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) -o $(NUTTX)$(EXEEXT) $(HEAD_OBJ) $(EXTRA_OBJS) \ --start-group $(LDLIBS) -lboard --end-group $(EXTRA_LIBS) $(LIBGCC) ifeq ($(CONFIG_BOOT_RUNFROMFLASH),y) @export flashloc=`$(OBJDUMP) --all-headers $(NUTTX)$(EXEEXT) | grep _eronly | cut -d' ' -f1`; \ @@ -117,6 +117,18 @@ endif mv $(NUTTX).flashimage $(NUTTX)$(EXEEXT); \ fi +# 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: Makefile chip/Make.defs $(SRCS) @if [ -e board/Makefile ]; then \ $(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \ |