From 7c459c849dcde95dcb17f4d76421d945736b6854 Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Wed, 2 Jul 2008 14:11:34 +0000 Subject: [PATCH] The .ihex file use the intermediate Contiki-wide .$(TARGET) target instead of the MSP430-specific .firmware --- cpu/msp430/Makefile.msp430 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpu/msp430/Makefile.msp430 b/cpu/msp430/Makefile.msp430 index 3d334cf93..15c705dc1 100644 --- a/cpu/msp430/Makefile.msp430 +++ b/cpu/msp430/Makefile.msp430 @@ -1,4 +1,4 @@ -# $Id: Makefile.msp430,v 1.23 2008/02/03 20:59:35 adamdunkels Exp $ +# $Id: Makefile.msp430,v 1.24 2008/07/02 14:11:34 adamdunkels Exp $ ifdef nodeid CFLAGS += -DNODEID=$(nodeid) @@ -67,7 +67,7 @@ PROJECT_OBJECTFILES += ${addprefix $(OBJECTDIR)/,$(CONTIKI_TARGET_MAIN:.c=.o)} %.firmware: %.co $(PROJECT_OBJECTFILES) contiki-$(TARGET).a $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(filter-out %.a,$^) $(filter %.a,$^) -%.ihex: %.firmware +%.ihex: %.$(TARGET) $(OBJCOPY) $^ -O ihex $@ core-labels.o: core.firmware