From 09447f3bff1c2c48e71ebc51ef337a8bb4f5303f Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Mon, 10 Dec 2012 16:15:02 +0100 Subject: fw/build: The app/board/env combo macro need to be last The app template will create the list of app specific objs so that needs to be before Signed-off-by: Sylvain Munaut --- src/target/firmware/Makefile.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/target/firmware/Makefile.inc b/src/target/firmware/Makefile.inc index a679db4a..844da692 100644 --- a/src/target/firmware/Makefile.inc +++ b/src/target/firmware/Makefile.inc @@ -124,11 +124,6 @@ ALL_OBJS+=$$($(1)_OBJS) apps/$(1)/main.o endef # define rules for all defined applications -$(foreach app,$(APPLICATIONS), \ - $(foreach brd,$(BOARDS), \ - $(foreach env,$($(brd)_ENVIRONMENTS), \ - $(eval $(call APPLICATION_BOARD_ENVIRONMENT_template,$(app),$(brd),$(env)))))) - $(foreach brd,$(BOARDS), \ $(eval $(call BOARD_template,$(brd)) \ $(foreach env,$($(brd)_ENVIRONMENTS), \ @@ -137,6 +132,11 @@ $(foreach brd,$(BOARDS), \ $(foreach app,$(APPLICATIONS), \ $(eval $(call APPLICATION_template,$(app)))) +$(foreach app,$(APPLICATIONS), \ + $(foreach brd,$(BOARDS), \ + $(foreach env,$($(brd)_ENVIRONMENTS), \ + $(eval $(call APPLICATION_BOARD_ENVIRONMENT_template,$(app),$(brd),$(env)))))) + # add common things to global lists ALL_OBJS+=$(ANY_APP_OBJS) -- cgit v1.2.3