[incubator-nuttx-apps] branch master updated: export APPDIR using 'export' keyword (TOPDIR already exported by nuttx/)

[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 053ca8f  export APPDIR using 'export' keyword (TOPDIR already exported 
by nuttx/)
053ca8f is described below

commit 053ca8fcca59a1a305894528edf23eafc852de9e
Author: Matias N <mat...@protobits.dev>
AuthorDate: Tue Sep 15 13:59:18 2020 -0300

    export APPDIR using 'export' keyword (TOPDIR already exported by nuttx/)
---
 Makefile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index acc4afb..192b9fb 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@
 #
 ############################################################################
 
-APPDIR = $(CURDIR)
+export APPDIR = $(CURDIR)
 include $(APPDIR)/Make.defs
 
 # Symbol table for loadable apps.
@@ -78,7 +78,7 @@ ifeq ($(CONFIG_BUILD_KERNEL),y)
 install: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_install)
 
 .import: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
-       $(Q) $(MAKE) install TOPDIR="$(TOPDIR)"
+       $(Q) $(MAKE) install
 
 import: $(IMPORT_TOOLS)
        $(Q) $(MAKE) context TOPDIR="$(APPDIR)$(DELIM)import"
@@ -94,16 +94,16 @@ ifeq ($(CONFIG_BUILD_LOADABLE),)
 
 $(BIN): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
        $(Q) for app in ${CONFIGURED_APPS}; do \
-               $(MAKE) -C "$${app}" archive TOPDIR="${TOPDIR}" 
APPDIR="${APPDIR}" ; \
+               $(MAKE) -C "$${app}" archive ; \
        done
 
 else
 
 $(SYMTABSRC): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
        $(Q) for app in ${CONFIGURED_APPS}; do \
-               $(MAKE) -C "$${app}" archive TOPDIR="${TOPDIR}" 
APPDIR="${APPDIR}" ; \
+               $(MAKE) -C "$${app}" archive ; \
        done
-       $(Q) $(MAKE) install TOPDIR="$(TOPDIR)"
+       $(Q) $(MAKE) install 
        $(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BINDIR) >$@.tmp
        $(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
 
@@ -150,13 +150,13 @@ import: $(IMPORT_TOOLS)
 endif # CONFIG_BUILD_KERNEL
 
 dirlinks:
-       $(Q) $(MAKE) -C platform dirlinks TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
+       $(Q) $(MAKE) -C platform dirlinks
 
 context_rest: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_context)
 
 context_serialize:
-       $(Q) $(MAKE) -C builtin context TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
-       $(Q) $(MAKE) context_rest TOPDIR="$(TOPDIR)"
+       $(Q) $(MAKE) -C builtin context
+       $(Q) $(MAKE) context_rest
 
 context: context_serialize
 
@@ -184,8 +184,8 @@ endif
 depend: .depend
 
 clean_context:
-       $(Q) $(MAKE) -C platform clean_context TOPDIR="$(TOPDIR)" 
APPDIR="$(APPDIR)"
-       $(Q) $(MAKE) -C builtin clean_context TOPDIR="$(TOPDIR)" 
APPDIR="$(APPDIR)"
+       $(Q) $(MAKE) -C platform clean_context
+       $(Q) $(MAKE) -C builtin clean_context
 
 clean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_clean)
        $(call DELFILE, $(SYMTABSRC))