Merge pull request #428 from g-oikonomou/config-sanity
Remove unnecessary stuff from various Makefiles (Config Sanity, Pt 1)
This commit is contained in:
commit
0d04db2b03
@ -7,8 +7,6 @@ all: er-example-server er-example-client
|
||||
WITH_COAP=13
|
||||
|
||||
|
||||
# variable for Makefile.include
|
||||
WITH_UIP6=1
|
||||
# for some platforms
|
||||
UIP_CONF_IPV6=1
|
||||
# IPv6 make config disappeared completely
|
||||
|
@ -1,6 +1,5 @@
|
||||
CONTIKI=../../..
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
SMALL=1
|
||||
|
||||
|
@ -4,7 +4,6 @@ APPS = slip-cmd
|
||||
|
||||
CONTIKI=../../..
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL -DUIP_CONF_IPV6 -DWITH_UIP6
|
||||
|
||||
|
@ -3,7 +3,6 @@ all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI=../../..
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL
|
||||
|
||||
|
@ -3,7 +3,6 @@ APPS = powertrace collect-view
|
||||
CONTIKI_PROJECT = udp-sender udp-sink
|
||||
PROJECT_SOURCEFILES += collect-common.c
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL
|
||||
|
||||
|
@ -2,7 +2,6 @@ all: udp-client udp-server
|
||||
APPS=servreg-hack
|
||||
CONTIKI=../../..
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL
|
||||
|
@ -2,7 +2,6 @@ all: broadcast-example unicast-sender unicast-receiver
|
||||
APPS=servreg-hack
|
||||
CONTIKI=../../..
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL
|
||||
|
||||
|
@ -2,7 +2,6 @@ all: sky-websense
|
||||
|
||||
CONTIKI=../../..
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL
|
||||
|
||||
|
@ -8,7 +8,6 @@ endif
|
||||
|
||||
CONTIKI=../../..
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
UIP_CONF_RPL=0
|
||||
|
||||
|
@ -2,7 +2,6 @@ all: mbxxx-websense
|
||||
|
||||
CONTIKI=../../..
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
APPS += webserver webbrowser
|
||||
|
@ -6,7 +6,6 @@ endif
|
||||
|
||||
CONTIKI=../..
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
WITH_COAP = 1
|
||||
|
@ -7,8 +7,6 @@ all: remotepowerswitch
|
||||
CONTIKI=../../../
|
||||
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
|
||||
|
||||
# variable for root Makefile.include
|
||||
WITH_UIP6=1
|
||||
# for some platforms
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
CONTIKI_PROJECT = example-servreg-client
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
APPS=servreg-hack
|
||||
|
@ -6,7 +6,6 @@ ifndef TARGET
|
||||
TARGET = sky
|
||||
endif
|
||||
|
||||
WITH_UIP6 = 1
|
||||
UIP_CONF_IPV6 = 1
|
||||
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
|
||||
SMALL = 1
|
||||
|
@ -2,7 +2,6 @@ all: z1-websense
|
||||
|
||||
CONTIKI=../../../..
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
SMALL=1
|
||||
|
@ -20,7 +20,6 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
|
||||
CLEAN += *.cc2530dk
|
||||
|
||||
ifeq ($(UIP_CONF_IPV6),1)
|
||||
CFLAGS += -DUIP_CONF_IPV6=1
|
||||
CONTIKI_TARGET_SOURCEFILES += viztool.c
|
||||
endif
|
||||
|
||||
|
@ -22,11 +22,6 @@ ifndef SMALL
|
||||
SMALL = 1
|
||||
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
|
||||
CONTIKI_CPU=$(CONTIKI)/cpu/cc2538
|
||||
include $(CONTIKI_CPU)/Makefile.cc2538
|
||||
|
@ -47,7 +47,6 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
|
||||
CLEAN += *.sensinode
|
||||
|
||||
ifeq ($(UIP_CONF_IPV6),1)
|
||||
CFLAGS += -DUIP_CONF_IPV6=1
|
||||
ifeq ($(OFFSET_FIRMWARE),1)
|
||||
CFLAGS += -DDISCO_ENABLED=1
|
||||
CONTIKI_TARGET_SOURCEFILES += disco.c
|
||||
|
@ -1,6 +1,5 @@
|
||||
CONTIKI=../../../..
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL -DPROJECT_CONF_H=\"project-conf.h\"
|
||||
|
||||
|
@ -1,6 +1,5 @@
|
||||
CONTIKI=../../../..
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL -DPROJECT_CONF_H=\"project-conf.h\"
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
all: sender-node receiver-node root-node
|
||||
CONTIKI=../../..
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user