Merge pull request #82 from darconeous/master

Makefiles: Allow setting UIP_CONF_IPV6=0 to work as expected.
This commit is contained in:
Adam Dunkels 2013-03-10 12:51:03 -07:00
commit 0841bce833
18 changed files with 21 additions and 21 deletions

View file

@ -16,7 +16,7 @@ CONTIKI_TARGET_SOURCEFILES += wpcap-drv.c wpcap.c
else
CONTIKI_TARGET_SOURCEFILES += tapdev-drv.c
#math
ifndef UIP_CONF_IPV6
ifneq ($(UIP_CONF_IPV6),1)
CONTIKI_TARGET_SOURCEFILES += tapdev.c
else
CONTIKI_TARGET_SOURCEFILES += tapdev6.c