sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

export APPDIR using 'export' keyword (TOPDIR already exported by nuttx/)

Browse Source
This commit is contained in:
Matias N 2020-09-15 13:59:18 -03:00 committed by Xiang Xiao
parent 03c3b2ed0f
commit 053ca8fcca
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

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