This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit aaa61346c932409918b3a5a094dd480d96619071
Author: chao.an <anc...@xiaomi.com>
AuthorDate: Tue Jun 30 21:20:29 2020 +0800
make/import: move the binary install to the top Makefile
move the binary install to the main Makefile to support
link extra libraries
Change-Id: I6db8a244ec9975163ea0c21fec6468e215c5aedb
Signed-off-by: chao.an <anc...@xiaomi.com>
---
Makefile | 19 ++++++++++++++++++-
import/Makefile | 20 +-------------------
2 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/Makefile b/Makefile
index 678ee7c..5b495b1 100644
--- a/Makefile
+++ b/Makefile
@@ -121,13 +121,30 @@ endif # !CONFIG_BUILD_LOADABLE
install: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_install)
+# Link nuttx
+
+HEAD_OBJ += $(wildcard
$(APPDIR)$(DELIM)import$(DELIM)startup$(DELIM)*$(OBJEXT))
+HEAD_OBJ += $(wildcard $(APPDIR)$(DELIM)builtin$(DELIM)*$(OBJEXT))
+
.import: $(BIN) install
+ $(Q) echo "LD: nuttx"
+ $(Q) $(LD) --entry=__start $(LDFLAGS) $(LDLIBPATH) $(EXTRA_LIBPATHS) \
+ -L$(APPDIR)$(DELIM)import$(DELIM)scripts -T$(LDNAME) \
+ -o nuttx$(EXEEXT) $(HEAD_OBJ) $(EXTRA_OBJS) $(LDSTARTGROUP) \
+ $(BIN) $(LDLIBS) $(EXTRA_LIBS) $(LDENDGROUP)
+ifeq ($(CONFIG_INTELHEX_BINARY),y)
+ $(Q) echo "CP: nuttx.hex"
+ $(Q) $(OBJCOPY) $(OBJCOPYARGS) -O ihex nuttx$(EXEEXT) nuttx.hex
+endif
+ifeq ($(CONFIG_RAW_BINARY),y)
+ $(Q) echo "CP: nuttx.bin"
+ $(Q) $(OBJCOPY) $(OBJCOPYARGS) -O binary nuttx$(EXEEXT) nuttx.bin
+endif
import: $(IMPORT_TOOLS)
$(Q) $(MAKE) context TOPDIR="$(APPDIR)$(DELIM)import"
$(Q) $(MAKE) depend TOPDIR="$(APPDIR)$(DELIM)import"
$(Q) $(MAKE) .import TOPDIR="$(APPDIR)$(DELIM)import"
- $(Q) $(MAKE) -C import install TOPDIR="$(APPDIR)$(DELIM)import"
endif # CONFIG_BUILD_KERNEL
diff --git a/import/Makefile b/import/Makefile
index 763c4cc..63eb4be 100644
--- a/import/Makefile
+++ b/import/Makefile
@@ -43,25 +43,7 @@ FILES = .config System.map User.map
all:
.PHONY: context depend clean distclean
-APPDIR = $(realpath $(CURDIR)$(DELIM)..)
-HEAD_OBJ += $(wildcard $(TOPDIR)$(DELIM)startup$(DELIM)*$(OBJEXT))
-HEAD_OBJ += $(wildcard $(APPDIR)$(DELIM)builtin$(DELIM)*$(OBJEXT))
-
-$(APPDIR)$(DELIM)nuttx$(EXEEXT): $(wildcard $(APPDIR)$(DELIM)*$(LIBEXT))
- $(Q) echo "LD: nuttx"
- $(Q) $(LD) --entry=__start $(LDFLAGS) -T$(LDSCRIPT) $(LIBPATHS) \
- $(LDLIBPATH) -L$(CURDIR)$(DELIM)scripts -o $@ $(HEAD_OBJ) \
- $(EXTRA_OBJS) $(LDSTARTGROUP) $^ $(LDLIBS) $(EXTRA_LIBS) $(LDENDGROUP)
-ifeq ($(CONFIG_INTELHEX_BINARY),y)
- $(Q) echo "CP: nuttx.hex"
- $(Q) $(OBJCOPY) $(OBJCOPYARGS) -O ihex $@ nuttx.hex
-endif
-ifeq ($(CONFIG_RAW_BINARY),y)
- $(Q) echo "CP: nuttx.bin"
- $(Q) $(OBJCOPY) $(OBJCOPYARGS) -O binary $@ nuttx.bin
-endif
-
-install: $(APPDIR)$(DELIM)nuttx$(EXEEXT)
+install:
context:
