Patch by Gideon Ernst: use explicit $(CONTIKI) path instead of implicit ../../ path to the mknmlist script

This commit is contained in:
adamdunkels 2009-09-03 17:41:58 +00:00
parent a21dece53f
commit 18486d4e3d
4 changed files with 5 additions and 5 deletions

View file

@ -145,7 +145,7 @@ ifdef CORE
$(CC) $(LDFLAGS) $(CFLAGS) -nostartfiles -o $@ $(filter-out %.a,$^) $(filter %.a,$^) -lc $(filter %.a,$^) $(CC) $(LDFLAGS) $(CFLAGS) -nostartfiles -o $@ $(filter-out %.a,$^) $(filter %.a,$^) -lc $(filter %.a,$^)
symbols.c: $(CORE) symbols.c: $(CORE)
$(NM) $< | awk -f $(CONTIKI_CPU)/builtins.awk -f ../../tools/mknmlist > symbols.c $(NM) $< | awk -f $(CONTIKI_CPU)/builtins.awk -f $(CONTIKI)/tools/mknmlist > symbols.c
else else
%.$(TARGET): %-nosyms.$(TARGET) %.$(TARGET): %-nosyms.$(TARGET)

View file

@ -1,4 +1,4 @@
# $Id: Makefile.msp430,v 1.28 2009/03/17 15:56:32 adamdunkels Exp $ # $Id: Makefile.msp430,v 1.29 2009/09/03 17:41:58 adamdunkels Exp $
ifdef nodeid ifdef nodeid
CFLAGS += -DNODEID=$(nodeid) CFLAGS += -DNODEID=$(nodeid)
@ -86,7 +86,7 @@ loader-init.o: ${CONTIKI_TARGET}/loader/loader-init.S
ifdef CORE ifdef CORE
symbols.c: symbols.c:
# @${CONTIKI}/tools/msp430-make-symbols $(CORE) # @${CONTIKI}/tools/msp430-make-symbols $(CORE)
$(NM) $(CORE) | awk -f ../../tools/mknmlist > symbols.c $(NM) $(CORE) | awk -f $(CONTIKI)/tools/mknmlist > symbols.c
else else
symbols.c symbols.h: symbols.c symbols.h:
@${CONTIKI}/tools/make-empty-symbols @${CONTIKI}/tools/make-empty-symbols

View file

@ -24,7 +24,7 @@ LDFLAGS = -Wl,-Map=contiki-$(TARGET).map,-export-dynamic
ifdef CORE ifdef CORE
.PHONY: symbols.c symbols.h .PHONY: symbols.c symbols.h
symbols.c symbols.h: symbols.c symbols.h:
$(NM) -C $(CORE) | grep -v @ | grep -v dll_crt0 | awk -f ../../tools/mknmlist > symbols.c $(NM) -C $(CORE) | grep -v @ | grep -v dll_crt0 | awk -f $(CONTIKI)/tools/mknmlist > symbols.c
# @${CONTIKI}/tools/make-symbols $(CORE) # @${CONTIKI}/tools/make-symbols $(CORE)
else else
symbols.c symbols.h: symbols.c symbols.h:

View file

@ -20,7 +20,7 @@ LDFLAGS = -Wl,-Map=contiki-$(TARGET).map,-export-dynamic
# .PHONY: symbols.c symbols.h # .PHONY: symbols.c symbols.h
ifdef CORE ifdef CORE
symbols.c symbols.h: symbols.c symbols.h:
$(NM) $(CORE) | awk -f ../../tools/mknmlist > symbols.c $(NM) $(CORE) | awk -f $(CONTIKI)/tools/mknmlist > symbols.c
# @${CONTIKI}/tools/make-symbols $(CORE) # @${CONTIKI}/tools/make-symbols $(CORE)
else else
symbols.c symbols.h: symbols.c symbols.h: