Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-08-06 20:28:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #428 from g-oikonomou/config-sanity

Browse Source 
Remove unnecessary stuff from various Makefiles (Config Sanity, Pt 1)
This commit is contained in:
Adam Dunkels 2013-11-26 15:05:08 -08:00
commit 0d04db2b03
21 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/er-rest-example/Makefile
View File

@ -7,8 +7,6 @@ all: er-example-server er-example-client
WITH_COAP=13 WITH_COAP=13
# variable for Makefile.include
WITH_UIP6=1
# for some platforms # for some platforms
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
# IPv6 make config disappeared completely # IPv6 make config disappeared completely

1
examples/ipv6/json-ws/Makefile
View File

@ -1,6 +1,5 @@
CONTIKI=../../.. CONTIKI=../../..
WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
SMALL=1 SMALL=1

1
examples/ipv6/native-border-router/Makefile
View File

@ -4,7 +4,6 @@ APPS = slip-cmd
CONTIKI=../../.. CONTIKI=../../..
WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
CFLAGS+= -DUIP_CONF_IPV6_RPL -DUIP_CONF_IPV6 -DWITH_UIP6 CFLAGS+= -DUIP_CONF_IPV6_RPL -DUIP_CONF_IPV6 -DWITH_UIP6

1
examples/ipv6/rpl-border-router/Makefile
View File

@ -3,7 +3,6 @@ all: $(CONTIKI_PROJECT)
CONTIKI=../../.. CONTIKI=../../..
WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
CFLAGS+= -DUIP_CONF_IPV6_RPL CFLAGS+= -DUIP_CONF_IPV6_RPL

1
examples/ipv6/rpl-collect/Makefile
View File

@ -3,7 +3,6 @@ APPS = powertrace collect-view
CONTIKI_PROJECT = udp-sender udp-sink CONTIKI_PROJECT = udp-sender udp-sink
PROJECT_SOURCEFILES += collect-common.c PROJECT_SOURCEFILES += collect-common.c
WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
CFLAGS+= -DUIP_CONF_IPV6_RPL CFLAGS+= -DUIP_CONF_IPV6_RPL

1
examples/ipv6/rpl-udp/Makefile
View File

@ -2,7 +2,6 @@ all: udp-client udp-server
APPS=servreg-hack APPS=servreg-hack
CONTIKI=../../.. CONTIKI=../../..
WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
CFLAGS+= -DUIP_CONF_IPV6_RPL CFLAGS+= -DUIP_CONF_IPV6_RPL

1
examples/ipv6/simple-udp-rpl/Makefile
View File

@ -2,7 +2,6 @@ all: broadcast-example unicast-sender unicast-receiver
APPS=servreg-hack APPS=servreg-hack
CONTIKI=../../.. CONTIKI=../../..
WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
CFLAGS+= -DUIP_CONF_IPV6_RPL CFLAGS+= -DUIP_CONF_IPV6_RPL

1
examples/ipv6/sky-websense/Makefile
View File

@ -2,7 +2,6 @@ all: sky-websense
CONTIKI=../../.. CONTIKI=../../..
WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
CFLAGS+= -DUIP_CONF_IPV6_RPL CFLAGS+= -DUIP_CONF_IPV6_RPL

1
examples/ipv6/slip-radio/Makefile
View File

@ -8,7 +8,6 @@ endif
CONTIKI=../../.. CONTIKI=../../..
WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
UIP_CONF_RPL=0 UIP_CONF_RPL=0

1
examples/mbxxx/mbxxx-websense/Makefile
View File

@ -2,7 +2,6 @@ all: mbxxx-websense
CONTIKI=../../.. CONTIKI=../../..
WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
APPS += webserver webbrowser APPS += webserver webbrowser

1
examples/rest-example/Makefile
View File

@ -6,7 +6,6 @@ endif
CONTIKI=../.. CONTIKI=../..
WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
WITH_COAP = 1 WITH_COAP = 1

2
examples/seedeye/powerswitch/Makefile
View File

@ -7,8 +7,6 @@ all: remotepowerswitch
CONTIKI=../../../ CONTIKI=../../../
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
# variable for root Makefile.include
WITH_UIP6=1
# for some platforms # for some platforms
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1

1
examples/servreg-hack/Makefile
View File

@ -1,7 +1,6 @@
CONTIKI_PROJECT = example-servreg-client CONTIKI_PROJECT = example-servreg-client
all: $(CONTIKI_PROJECT) all: $(CONTIKI_PROJECT)
WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
APPS=servreg-hack APPS=servreg-hack

1
examples/udp-stream/Makefile
View File

@ -6,7 +6,6 @@ ifndef TARGET
TARGET = sky TARGET = sky
endif endif
WITH_UIP6 = 1
UIP_CONF_IPV6 = 1 UIP_CONF_IPV6 = 1
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
SMALL = 1 SMALL = 1

1
examples/z1/ipv6/z1-websense/Makefile
View File

@ -2,7 +2,6 @@ all: z1-websense
CONTIKI=../../../.. CONTIKI=../../../..
WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
SMALL=1 SMALL=1

1
platform/cc2530dk/Makefile.cc2530dk
View File

@ -20,7 +20,6 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
CLEAN += *.cc2530dk CLEAN += *.cc2530dk
ifeq ($(UIP_CONF_IPV6),1) ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DUIP_CONF_IPV6=1
CONTIKI_TARGET_SOURCEFILES += viztool.c CONTIKI_TARGET_SOURCEFILES += viztool.c
endif endif

5
platform/cc2538dk/Makefile.cc2538dk
View File

@ -22,11 +22,6 @@ ifndef SMALL
SMALL = 1 SMALL = 1
endif endif
### If the prject's Makefile specified IPv6, the pre-processor needs to know
ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DUIP_CONF_IPV6=1
endif
### Define the CPU directory ### Define the CPU directory
CONTIKI_CPU=$(CONTIKI)/cpu/cc2538 CONTIKI_CPU=$(CONTIKI)/cpu/cc2538
include $(CONTIKI_CPU)/Makefile.cc2538 include $(CONTIKI_CPU)/Makefile.cc2538

1
platform/sensinode/Makefile.sensinode
View File

@ -47,7 +47,6 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
CLEAN += *.sensinode CLEAN += *.sensinode
ifeq ($(UIP_CONF_IPV6),1) ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DUIP_CONF_IPV6=1
ifeq ($(OFFSET_FIRMWARE),1) ifeq ($(OFFSET_FIRMWARE),1)
CFLAGS += -DDISCO_ENABLED=1 CFLAGS += -DDISCO_ENABLED=1
CONTIKI_TARGET_SOURCEFILES += disco.c CONTIKI_TARGET_SOURCEFILES += disco.c

1
regression-tests/11-ipv6/code/receiver/Makefile
View File

@ -1,6 +1,5 @@
CONTIKI=../../../.. CONTIKI=../../../..
WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
CFLAGS+= -DUIP_CONF_IPV6_RPL -DPROJECT_CONF_H=\"project-conf.h\" CFLAGS+= -DUIP_CONF_IPV6_RPL -DPROJECT_CONF_H=\"project-conf.h\"

1
regression-tests/11-ipv6/code/sender/Makefile
View File

@ -1,6 +1,5 @@
CONTIKI=../../../.. CONTIKI=../../../..
WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
CFLAGS+= -DUIP_CONF_IPV6_RPL -DPROJECT_CONF_H=\"project-conf.h\" CFLAGS+= -DUIP_CONF_IPV6_RPL -DPROJECT_CONF_H=\"project-conf.h\"

1
regression-tests/12-rpl/code/Makefile
View File

@ -1,7 +1,6 @@
all: sender-node receiver-node root-node all: sender-node receiver-node root-node
CONTIKI=../../.. CONTIKI=../../..
WITH_UIP6=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
CFLAGS+= -DUIP_CONF_IPV6_RPL CFLAGS+= -DUIP_CONF_IPV6_RPL