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

apps/Makefile: Move APPDIR set to the first and remove APPDIR from command line but ensure TOPDIR/BINDIR are always set in command line.

Browse Source
This commit is contained in:
Xiang Xiao 2019-10-01 11:46:38 -06:00 committed by Gregory Nutt
parent c73af9c3c8
commit 18bd9acd3d
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.mk
View File

@ -46,7 +46,7 @@ all: nothing
define SDIR_template define SDIR_template
$(1)_$(2): $(1)_$(2):
$(Q) cd $(1) && $(MAKE) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" $(Q) cd $(1) && $(MAKE) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BINDIR="$(BINDIR)"
endef endef
$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),preconfig))) $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),preconfig)))

13
Makefile
View File

@ -35,15 +35,14 @@
# #
############################################################################ ############################################################################
TOPDIR ?= $(APPDIR)/import
-include $(TOPDIR)/Make.defs
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
APPDIR = ${shell echo %CD%} APPDIR = ${shell echo %CD%}
else else
APPDIR = ${shell pwd} APPDIR = ${shell pwd}
endif endif
TOPDIR ?= $(APPDIR)/import
-include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs -include $(APPDIR)/Make.defs
# Application Directories # Application Directories
@ -120,7 +119,7 @@ $(BINDIR):
$(Q) mkdir -p $(BINDIR) $(Q) mkdir -p $(BINDIR)
.import: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all) .import: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
$(Q) $(MAKE) install TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" $(Q) $(MAKE) install TOPDIR="$(TOPDIR)"
import: $(BINDIR) import: $(BINDIR)
$(Q) $(MAKE) .import TOPDIR="$(APPDIR)$(DELIM)import" $(Q) $(MAKE) .import TOPDIR="$(APPDIR)$(DELIM)import"
@ -137,7 +136,7 @@ $(BIN): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
else else
$(SYMTABSRC): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all) $(SYMTABSRC): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
$(Q) $(MAKE) install TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" $(Q) $(MAKE) install TOPDIR="$(TOPDIR)"
$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BINDIR) $(SYMTABSRC) $(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BINDIR) $(SYMTABSRC)
$(SYMTABOBJ): %$(OBJEXT): %.c $(SYMTABOBJ): %$(OBJEXT): %.c
@ -175,8 +174,8 @@ 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 TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BINDIR="$(BINDIR)"
$(Q) $(MAKE) context_rest $(Q) $(MAKE) context_rest TOPDIR="$(TOPDIR)"
context: context_serialize context: context_serialize