diff options
| author | Sylvain Munaut <tnt@246tNt.com> | 2012-12-10 16:15:02 +0100 |
|---|---|---|
| committer | Sylvain Munaut <tnt@246tNt.com> | 2013-01-02 20:44:10 +0100 |
| commit | 09447f3bff1c2c48e71ebc51ef337a8bb4f5303f (patch) | |
| tree | 4c3b1a72197473fc8bda8174e7668f050d81b03b | |
| parent | 4aab780f2079e47f488ef32928e6d8aaf218c129 (diff) | |
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 <tnt@246tNt.com>
| -rw-r--r-- | src/target/firmware/Makefile.inc | 10 |
1 files 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) |