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

made linkable with IAR linker - avoiding multiple defs of rime_sniffer, etc

Browse source
This commit is contained in:
Joakim Eriksson 2011-11-08 11:57:17 +01:00
parent 91cf1cc92e
commit 5281e7c59c
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/net/rime/Makefile.rime
View file

@ -1,3 +1,7 @@
ifdef UIP_CONF_IPV6
#RIME_UIP6 = rime-udp.c
RIME_BASE = rimeaddr.c timesynch.c rimestats.c
else
RIME_CHAMELEON = chameleon.c channel.c chameleon-raw.c chameleon-bitopt.c RIME_CHAMELEON = chameleon.c channel.c chameleon-raw.c chameleon-bitopt.c
RIME_BASE = rimeaddr.c rime.c timesynch.c \ RIME_BASE = rimeaddr.c rime.c timesynch.c \
rimestats.c announcement.c polite-announcement.c \ rimestats.c announcement.c polite-announcement.c \
@ -10,8 +14,6 @@ RIME_MESH = mesh.c route.c route-discovery.c
RIME_COLLECT = collect.c collect-neighbor.c neighbor-discovery.c \ RIME_COLLECT = collect.c collect-neighbor.c neighbor-discovery.c \
collect-link-estimate.c collect-link-estimate.c
RIME_RUDOLPH = rudolph0.c rudolph1.c rudolph2.c RIME_RUDOLPH = rudolph0.c rudolph1.c rudolph2.c
ifdef UIP_CONF_IPV6
#RIME_UIP6 = rime-udp.c
endif # UIP_CONF_IPV6 endif # UIP_CONF_IPV6
CONTIKI_SOURCEFILES += $(RIME_BASE) \ CONTIKI_SOURCEFILES += $(RIME_BASE) \