From 4aab780f2079e47f488ef32928e6d8aaf218c129 Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Mon, 10 Dec 2012 16:13:20 +0100 Subject: 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 --- src/target/firmware/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/target/firmware/Makefile.inc b/src/target/firmware/Makefile.inc index 5c60b7d2..a679db4a 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) -- cgit v1.2.3