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

Add the dirlinks target to some Makefiles. This plugs some wholes open by last chicken-and-egg build fix

Browse Source
This commit is contained in:
Gregory Nutt 2016-07-28 12:00:03 -06:00
parent 256a836a23
commit 28c397b3ce
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -76,7 +76,7 @@ BIN = libapps$(LIBEXT)
# Build targets # Build targets
all: $(BIN) all: $(BIN)
.PHONY: import install context context_serialize context_rest .depdirs preconfig depend clean distclean .PHONY: import install dirlinks context context_serialize context_rest .depdirs preconfig depend clean distclean
define MAKE_template define MAKE_template
$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)" $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)"
@ -110,6 +110,9 @@ install: $(BIN_DIR) .install
import: import:
$(Q) $(MAKE) .import TOPDIR="$(APPDIR)$(DELIM)import" $(Q) $(MAKE) .import TOPDIR="$(APPDIR)$(DELIM)import"
dirlinks:
$(Q) $(MAKE) -C platform dirlinks TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
context_rest: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_context) context_rest: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_context)
context_serialize: context_serialize:

4
platform/Makefile
View File

@ -125,9 +125,11 @@ $(PLATFORMDIR): $(TOPDIR)$(DELIM).config
$(Q) $(DIRUNLINK) $(PLATFORMDIR) $(Q) $(DIRUNLINK) $(PLATFORMDIR)
$(Q) $(DIRLINK) $(LINKDIR) $(PLATFORMDIR) $(Q) $(DIRLINK) $(LINKDIR) $(PLATFORMDIR)
dirlinks: $(PLATFORMDIR)
install: install:
context: $(PLATFORMDIR) context: dirlinks
# Dependencies # Dependencies