deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compile using . instead of separate make rules for .firmware

Browse source
This commit is contained in:
nifi 2008-12-16 13:54:25 +00:00
parent d2dc732435
commit 9bf0dff605
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cpu/msp430/Makefile.msp430
View file

@ -1,4 +1,4 @@
# $Id: Makefile.msp430,v 1.25 2008/11/24 11:09:36 nifi Exp $ # $Id: Makefile.msp430,v 1.26 2008/12/16 13:54:25 nifi Exp $
ifdef nodeid ifdef nodeid
CFLAGS += -DNODEID=$(nodeid) CFLAGS += -DNODEID=$(nodeid)
@ -64,22 +64,22 @@ PROJECT_OBJECTFILES += ${addprefix $(OBJECTDIR)/,$(CONTIKI_TARGET_MAIN:.c=.o)}
%.o: ${CONTIKI_TARGET}/loader/%.S %.o: ${CONTIKI_TARGET}/loader/%.S
$(AS) -o $(notdir $(<:.S=.o)) $< $(AS) -o $(notdir $(<:.S=.o)) $<
%.firmware: %.co $(PROJECT_OBJECTFILES) contiki-$(TARGET).a %.firmware: %.${TARGET}
$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(filter-out %.a,$^) $(filter %.a,$^) mv $< $@
%.ihex: %.$(TARGET) %.ihex: %.$(TARGET)
$(OBJCOPY) $^ -O ihex $@ $(OBJCOPY) $^ -O ihex $@
%.mspsim: %.firmware %.mspsim: %.${TARGET}
java -jar ${CONTIKI}/tools/mspsim/mspsim.jar -platform=${TARGET} $< java -jar ${CONTIKI}/tools/mspsim/mspsim.jar -platform=${TARGET} $<
core-labels.o: core.firmware core-labels.o: core.${TARGET}
${CONTIKI}/tools/msp430-make-labels core.firmware > core-labels.S ${CONTIKI}/tools/msp430-make-labels core.${TARGET} > core-labels.S
$(AS) -o $@ core-labels.S $(AS) -o $@ core-labels.S
# cp core-labels.o app/ # cp core-labels.o app/
core-globals.o: core.firmware core-globals.o: core.${TARGET}
${CONTIKI}/tools/msp430-make-globals core.firmware > core-globals.S ${CONTIKI}/tools/msp430-make-globals core.${TARGET} > core-globals.S
$(AS) -o $@ core-globals.S $(AS) -o $@ core-globals.S
loader-init.o: ${CONTIKI_TARGET}/loader/loader-init.S loader-init.o: ${CONTIKI_TARGET}/loader/loader-init.S