From 95982b40baf6ffd379a5e554b5a905cba1950666 Mon Sep 17 00:00:00 2001 From: dak664 Date: Wed, 22 Dec 2010 21:13:09 +0000 Subject: [PATCH] $make will show avr-size once and only once whether or not a build needs to occur. --- cpu/avr/Makefile.avr | 5 ++++- examples/webserver-ipv6-raven/Makefile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cpu/avr/Makefile.avr b/cpu/avr/Makefile.avr index e57bc3e34..636fdbe7d 100644 --- a/cpu/avr/Makefile.avr +++ b/cpu/avr/Makefile.avr @@ -1,4 +1,4 @@ -# $Id: Makefile.avr,v 1.26 2010/11/12 17:15:00 dak664 Exp $ +# $Id: Makefile.avr,v 1.27 2010/12/22 21:13:09 dak664 Exp $ ### Check if we are running under Windows @@ -133,7 +133,10 @@ $(OBJECTDIR)/%.o: %.c %.elf: %.co $(PROJECT_OBJECTFILES) contiki-$(TARGET).a symbols.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter-out %.a,$^) $(filter %.a,$^) $(LDLIBS) +#Allow top-level makefile to always show size even when build is up to date +ifndef NOAVRSIZE avr-size -C --mcu=$(MCU) $@ +endif %.hex: %.out $(OBJCOPY) $^ -O ihex $@ diff --git a/examples/webserver-ipv6-raven/Makefile b/examples/webserver-ipv6-raven/Makefile index a4da3f561..7d1f72e3e 100644 --- a/examples/webserver-ipv6-raven/Makefile +++ b/examples/webserver-ipv6-raven/Makefile @@ -5,7 +5,7 @@ else endif all: - ${MAKE} -f Makefile.webserver TARGET=avr-raven webserver6.elf + ${MAKE} -f Makefile.webserver TARGET=avr-raven NOAVRSIZE=1 webserver6.elf #can't just rename, webserver6 may be open in debugger @if [ $(OUTFILE) != "webserver6" ]; then cp webserver6.elf $(OUTFILE).elf;fi avr-objcopy -O ihex -R .eeprom -R .fuse -R .signature $(OUTFILE).elf $(OUTFILE).hex