diff options
| author | Ingo Albrecht <prom@berlin.ccc.de> | 2010-03-24 03:30:00 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2010-04-08 10:35:26 +0200 |
| commit | cbfb0ff6137edc5ac9229b9941282b05d76e6e41 (patch) | |
| tree | e0fe50becd1eee8f54cdb2eb96e2235de022b1a7 /src | |
| parent | 2ecca7582a0fefd54146bd3e5588bec0cf117a9b (diff) | |
firmware: simplified makefile a little, fixing a dependency bug on the way.
Diffstat (limited to 'src')
| -rw-r--r-- | src/target/firmware/Makefile.inc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/target/firmware/Makefile.inc b/src/target/firmware/Makefile.inc index 92983222..7f91fb18 100644 --- a/src/target/firmware/Makefile.inc +++ b/src/target/firmware/Makefile.inc @@ -71,25 +71,27 @@ ALL_DEPS+=$(ANY_APP_OBJS:.o=.p) # template for application rules define APPLICATION_BOARD_ENVIRONMENT_template -$(1)_$(2)_$(3)_OBJS := apps/$(1)/main.o $(ANY_APP_OBJS) $(ANY_APP_LIBS) $$($(2)_OBJS) board/$(2)/manifest.$(3).o +# define set of objects for this binary +$(1)_$(2)_$(3)_OBJS := apps/$(1)/main.o $(ANY_APP_OBJS) $(ANY_APP_LIBS) $$($(2)_OBJS) +# define manifest compilation +board/$(2)/$(1).$(3).manifest.o: board/manifest.c + $(CROSS_COMPILE)$(CC) $(CFLAGS) -DAPPLICATION=\"$(3)\" -DBOARD=\"$(2)\" -DENVIRONMENT=\"$(3)\" -c -o $$@ $$< + +# add manifest object to object list +$(1)_$(2)_$(3)_OBJS+=board/$(2)/$(1).$(3).manifest.o + +# define compilation, generating various extra files on the way board/$(2)/$(1).$(3).elf board/$(2)/$(1).$(3).map board/$(2)/$(1).$(3).size: $$($(1)_$(2)_$(3)_OBJS) $$($(3)_LDS) - $(CROSS_COMPILE)$(LD) $(LDFLAGS) -T $$($(3)_LDS) -Bstatic -Map board/$(2)/$(1).$(3).map -o board/$(2)/$(1).$(3).elf --start-group $$($(1)_$(2)_$(3)_OBJS) --end-group + $(CROSS_COMPILE)$(LD) $(LDFLAGS) -T $$($(3)_LDS) -Bstatic \ + -Map board/$(2)/$(1).$(3).map -o board/$(2)/$(1).$(3).elf \ + --start-group $$($(1)_$(2)_$(3)_OBJS) --end-group $(CROSS_COMPILE)$(SIZE) board/$(2)/$(1).$(3).elf | tee board/$(2)/$(1).$(3).size ALL_APPS+=board/$(2)/$(1).$(3).elf endef -define BOARD_ENVIRONMENT_template - -board/$(1)/manifest.$(2).o: board/manifest.c - $(CROSS_COMPILE)$(CC) $(CFLAGS) -DBOARD=\"$(1)\" -DENVIRONMENT=\"$(2)\" -c -o $$@ $$< - -ALL_OBJS+=board/$(1)/manifest.$(2).o - -endef - define BOARD_template ALL_OBJS+=$$($(1)_OBJS) @@ -109,7 +111,6 @@ endef # define rules for all defined applications $(foreach app,$(APPLICATIONS),$(foreach brd,$(BOARDS),$(foreach env,$(ENVIRONMENTS),$(eval $(call APPLICATION_BOARD_ENVIRONMENT_template,$(app),$(brd),$(env)))))) -$(foreach brd,$(BOARDS),$(foreach env,$(ENVIRONMENTS),$(eval $(call BOARD_ENVIRONMENT_template,$(brd),$(env))))) $(foreach brd,$(BOARDS),$(eval $(call BOARD_template,$(brd)))) $(foreach app,$(APPLICATIONS),$(eval $(call APPLICATION_template,$(app)))) |