[incubator-nuttx-apps] branch master updated: make/import: add incdir into import build

[xiaoxiang]

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


The following commit(s) were added to refs/heads/master by this push:
     new 51388de  make/import: add incdir into import build
51388de is described below

commit 51388de7a141d506ccedf6f329a4d06f9666eeed
Author: chao.an <anc...@xiaomi.com>
AuthorDate: Tue Jun 30 11:33:53 2020 +0800

    make/import: add incdir into import build
    
    fix import build break caused by 'incdir' not found:
    
    $ make import -j12
    ...
    /bin/sh: 1: /home/archer/code/apps/import/tools/incdir: not found
    /bin/sh: 1: /home/archer/code/apps/import/tools/incdir: not found
    
    Signed-off-by: chao.an <anc...@xiaomi.com>
---
 Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 29d5e09..678ee7c 100644
--- a/Makefile
+++ b/Makefile
@@ -71,6 +71,11 @@ $(foreach SDIR, $(CLEANDIRS), $(eval $(call 
SDIR_template,$(SDIR),distclean)))
 $(MKDEP): $(TOPDIR)/tools/mkdeps.c
        $(HOSTCC) $(HOSTINCLUDES) $(HOSTCFLAGS) $< -o $@
 
+$(INCDIR): $(TOPDIR)/tools/incdir.c
+       $(HOSTCC) $(HOSTINCLUDES) $(HOSTCFLAGS) $< -o $@
+
+IMPORT_TOOLS = $(MKDEP) $(INCDIR)
+
 # In the KERNEL build, we must build and install all of the modules.  No
 # symbol table is needed
 
@@ -81,7 +86,8 @@ install: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_install)
 .import: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
        $(Q) $(MAKE) install TOPDIR="$(TOPDIR)"
 
-import: $(MKDEP) context
+import: $(IMPORT_TOOLS)
+       $(Q) $(MAKE) context TOPDIR="$(APPDIR)$(DELIM)import"
        $(Q) $(MAKE) depend TOPDIR="$(APPDIR)$(DELIM)import"
        $(Q) $(MAKE) .import TOPDIR="$(APPDIR)$(DELIM)import"
 
@@ -117,7 +123,8 @@ install: $(foreach SDIR, $(CONFIGURED_APPS), 
$(SDIR)_install)
 
 .import: $(BIN) install
 
-import: $(MKDEP) context
+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"