summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Munaut <tnt@246tNt.com>2012-12-10 16:13:20 +0100
committerSylvain Munaut <tnt@246tNt.com>2013-01-02 20:44:10 +0100
commit4aab780f2079e47f488ef32928e6d8aaf218c129 (patch)
treecdb0080c01cfe610e82e5228cbc6b27054de69d2
parent0bfedc439f009ee1d54dc0af0d92374e8725b96d (diff)
fw/build: Include app / board / env specific objs during build
Just put the env with the rest and not manifest and also allow app additional files Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-rw-r--r--src/target/firmware/Makefile.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/target/firmware/Makefile.inc b/src/target/firmware/Makefile.inc
index 5c60b7d..a679db4 100644
--- a/src/target/firmware/Makefile.inc
+++ b/src/target/firmware/Makefile.inc
@@ -78,7 +78,7 @@ default: all
define APPLICATION_BOARD_ENVIRONMENT_template
# define set of objects for this binary
-$(1)_$(2)_$(3)_OBJS := apps/$(1)/main.o $(ANY_APP_OBJS) $$($(2)_OBJS)
+$(1)_$(2)_$(3)_OBJS := apps/$(1)/main.o $(ANY_APP_OBJS) $$($(1)_OBJS) $$($(2)_OBJS) $$($(3)_OBJS)
$(1)_$(2)_$(3)_LIBS := $(ANY_APP_LIBS)
# define manifest compilation
@@ -90,7 +90,7 @@ board/$(2)/$(1).$(3).manifest.p: board/manifest.c
@touch board/$(2)/$(1).$(3).manifest.p
# add manifest object to object list
-$(1)_$(2)_$(3)_OBJS+=board/$(2)/$(1).$(3).manifest.o $$($(3)_OBJS)
+$(1)_$(2)_$(3)_OBJS+=board/$(2)/$(1).$(3).manifest.o
# define compilation rule, also generates map file
board/$(2)/$(1).$(3).elf board/$(2)/$(1).$(3).map: $$($(1)_$(2)_$(3)_OBJS) $$($(1)_$(2)_$(3)_LIBS) $$($(3)_LDS)