Fix Makefiles, remove/fix flash targets

The target "flash" and related stuff is now in the platform makefiles.

examples/osd/arduino-bh1750/Makefile

@@ -62,10 +62,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-bme280/Makefile

@@ -62,10 +62,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-bmp085/Makefile

@@ -62,10 +62,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-bmp280/Makefile

@@ -62,10 +62,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-climate3/Makefile

@@ -45,10 +45,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-dallaseprom/Makefile

@@ -62,10 +62,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-dallastemp/Makefile

@@ -62,10 +62,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-distance/Makefile

@@ -61,10 +61,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-dooralert/Makefile

@@ -61,10 +61,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-htu21/Makefile

@@ -62,10 +62,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-i2c-scanner/Makefile

@@ -61,10 +61,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-ledstrip/Makefile

@@ -62,10 +62,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-	
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-merkurboard/Makefile

@@ -61,10 +61,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-plantobserving/Makefile

@@ -61,10 +61,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-relaybox/Makefile

@@ -61,10 +61,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-rfid-rc522/Makefile

@@ -61,10 +61,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-roller/Makefile

@@ -11,7 +11,7 @@ CONTIKI_WITH_IPV6 = 1
 
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
-PROJECT_SOURCEFILES += ${SKETCH}.cpp kexp.c
+PROJECT_SOURCEFILES += ${SKETCH}.cpp # kexp.c
 
 # automatically build RESTful resources
 REST_RESOURCES_DIR = ./resources
@@ -24,27 +24,12 @@ REST_RESOURCES_FILES= $(notdir \
 PROJECTDIRS += $(REST_RESOURCES_DIR) $(REST_RESOURCES_DIR_COMMON)
 PROJECT_SOURCEFILES += $(REST_RESOURCES_FILES)
 
-# variable for Makefile.include
-ifneq ($(TARGET), minimal-net)
-CFLAGS += -DUIP_CONF_IPV6_RPL=1
-else
-# minimal-net does not support RPL under Linux and is mostly used to test CoAP only
-${info INFO: compiling without RPL}
-CFLAGS += -DUIP_CONF_IPV6_RPL=0
-CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\"
-${info INFO: compiling with large buffers}
-CFLAGS += -DUIP_CONF_BUFFER_SIZE=2048
-CFLAGS += -DREST_MAX_CHUNK_SIZE=1024
-CFLAGS += -DCOAP_MAX_HEADER_SIZE=640
-endif
-
 # linker optimizations
 SMALL=1
 
-
 # REST Engine shall use Erbium CoAP implementation
 APPS += er-coap
-APPS += rest-engine
+APPS += rest-engine json
 APPS += arduino
 
 include $(CONTIKI)/Makefile.include
@@ -61,10 +46,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-roomalert/Makefile

@@ -62,10 +62,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-sketch/Makefile

@@ -49,10 +49,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-soil-moisture/Makefile

@@ -62,10 +62,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-valve/Makefile

@@ -49,10 +49,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u # $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-wateralert/Makefile

@@ -61,10 +61,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-weather/Makefile

@@ -62,10 +62,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-windsonic/Makefile

@@ -62,10 +62,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/climate/Makefile

@@ -68,10 +68,3 @@ connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-rout
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0 
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/climate2/Makefile

@@ -70,10 +70,3 @@ connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-rout
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0 
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/dual-rgbw-actor/Makefile

@@ -2,84 +2,16 @@ EXE=er-example-server
 
 all: $(EXE)
 
-# variable for this Makefile
-# configure CoAP implementation (3|7|12|13) (er-coap-07 also supports CoAP draft 08)
-WITH_COAP=7
-
-# for some platforms
-UIP_CONF_IPV6=1
-# IPv6 make config disappeared completely
-CFLAGS += -DUIP_CONF_IPV6=1
-
 CONTIKI=../../..
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
-# variable for Makefile.include
-ifneq ($(TARGET), minimal-net)
-CFLAGS += -DUIP_CONF_IPV6_RPL=1
-else
-# minimal-net does not support RPL under Linux and is mostly used to test CoAP only
-${info INFO: compiling without RPL}
-CFLAGS += -DUIP_CONF_IPV6_RPL=0
-CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\"
-${info INFO: compiling with large buffers}
-CFLAGS += -DUIP_CONF_BUFFER_SIZE=2048
-CFLAGS += -DREST_MAX_CHUNK_SIZE=1024
-CFLAGS += -DCOAP_MAX_HEADER_SIZE=640
-endif
-
 # linker optimizations
 SMALL=1
 
-# REST framework, requires WITH_COAP
+APPS += er-coap rest-engine json
-ifeq ($(WITH_COAP), 13)
-${info INFO: compiling with CoAP-13}
-CFLAGS += -DWITH_COAP=13
-CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap-13
-else ifeq ($(WITH_COAP), 12)
-${info INFO: compiling with CoAP-12}
-CFLAGS += -DWITH_COAP=12
-CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap-12
-else ifeq ($(WITH_COAP), 7)
-${info INFO: compiling with CoAP-08}
-CFLAGS += -DWITH_COAP=7
-CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap-07
-else ifeq ($(WITH_COAP), 3)
-${info INFO: compiling with CoAP-03}
-CFLAGS += -DWITH_COAP=3
-CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap-03
-else
-${info INFO: compiling with HTTP}
-CFLAGS += -DWITH_HTTP
-CFLAGS += -DREST=http_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=1
-APPS += er-http-engine
-endif
-
-APPS += erbium
-
-# optional rules to get assembly
-#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
-#CUSTOM_RULE_S_TO_OBJECTDIR_O = 1
 
 include $(CONTIKI)/Makefile.include
 
-# optional rules to get assembly
-#$(OBJECTDIR)/%.o: asmdir/%.S
-#	$(CC) $(CFLAGS) -MMD -c $< -o $@
-#	@$(FINALIZE_DEPENDENCY)
-#
-#asmdir/%.S: %.c
-#	$(CC) $(CFLAGS) -MMD -S $< -o $@
-
 # border router rules
 $(CONTIKI)/tools/tunslip6:	$(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
@@ -92,10 +24,3 @@ connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/dual-rgbw-actor/er-example-server.c

@@ -43,23 +43,9 @@
 #include <string.h>
 #include "contiki.h"
 #include "contiki-net.h"
-#include "erbium.h"
 
 #include "dev/t4-servo-sensor.h"
 
-/* For CoAP-specific example: not required for normal RESTful Web service. */
-#if WITH_COAP == 3
-#include "er-coap-03.h"
-#elif WITH_COAP == 7
-#include "er-coap-07.h"
-#elif WITH_COAP == 12
-#include "er-coap-12.h"
-#elif WITH_COAP == 13
-#include "er-coap-13.h"
-#else
-#warning "Erbium example without CoAP-specifc functionality"
-#endif /* CoAP-specific example */
-
 #define DEBUG 1
 #if DEBUG
 #define PRINTF(...) printf(__VA_ARGS__)

examples/osd/embedd-vm-merkurboard/Makefile

@@ -62,10 +62,3 @@ connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/er-rest-example-merkurboard/Makefile

@@ -76,15 +76,19 @@ connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-rout
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0 
 
-avr-size-server: er-example-server.$(TARGET).sz
+avr-size-server: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).sz
 
-avr-size-client: er-example-server.$(TARGET).sz
+avr-size-client: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).sz
 
-flash-server: er-example-server.$(TARGET).u er-example-server.$(TARGET).eu
+flash-server: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).u \
+    er-example-server.$(TARGET)$(CUSTOM_SUFFIX).eu
 
-flash-client: er-example-client.$(TARGET).u er-example-client.$(TARGET).eu
+flash-client: er-example-client.$(TARGET)$(CUSTOM_SUFFIX).u \
+    er-example-client.$(TARGET)$(CUSTOM_SUFFIX).eu
 
 .PHONY: flash-client avr-size-client flash-server avr-size-server
-.PRECIOUS: er-example-server.$(TARGET).hex er-example-server.$(TARGET).eep \
+.PRECIOUS: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).hex \
-           er-example-client.$(TARGET).hex er-example-client.$(TARGET).eep
+    er-example-server.$(TARGET)$(CUSTOM_SUFFIX).eep \
+    er-example-client.$(TARGET)$(CUSTOM_SUFFIX).hex \
+    er-example-client.$(TARGET)$(CUSTOM_SUFFIX).eep
 

examples/osd/lgb-train/Makefile

@@ -61,10 +61,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/light-actor/Makefile

@@ -48,10 +48,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/light-shutter-control/Makefile

@@ -2,15 +2,6 @@ EXE=er-example-server
 
 all: $(EXE)
 
-# variable for this Makefile
-# configure CoAP implementation (3|7|12|13) (er-coap-07 also supports CoAP draft 08)
-WITH_COAP=13
-
-# for some platforms
-UIP_CONF_IPV6=1
-# IPv6 make config disappeared completely
-CFLAGS += -DUIP_CONF_IPV6=1
-
 CONTIKI=../../..
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
@@ -35,55 +26,11 @@ endif
 # linker optimizations
 SMALL=1
 
-# REST framework, requires WITH_COAP
-ifeq ($(WITH_COAP), 13)
-${info INFO: compiling with CoAP-13}
-CFLAGS += -DWITH_COAP=13
-CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap-13
-else ifeq ($(WITH_COAP), 12)
-${info INFO: compiling with CoAP-12}
-CFLAGS += -DWITH_COAP=12
-CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap-12
-else ifeq ($(WITH_COAP), 7)
-${info INFO: compiling with CoAP-08}
-CFLAGS += -DWITH_COAP=7
-CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap-07
-else ifeq ($(WITH_COAP), 3)
-${info INFO: compiling with CoAP-03}
-CFLAGS += -DWITH_COAP=3
-CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap-03
-else
-${info INFO: compiling with HTTP}
-CFLAGS += -DWITH_HTTP
-CFLAGS += -DREST=http_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=1
-APPS += er-http-engine
-endif
-
 APPS += erbium
-
+APPS += er-coap rest-engine
-# optional rules to get assembly
-#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
-#CUSTOM_RULE_S_TO_OBJECTDIR_O = 1
 
 include $(CONTIKI)/Makefile.include
 
-# optional rules to get assembly
-#$(OBJECTDIR)/%.o: asmdir/%.S
-#	$(CC) $(CFLAGS) -MMD -c $< -o $@
-#	@$(FINALIZE_DEPENDENCY)
-#
-#asmdir/%.S: %.c
-#	$(CC) $(CFLAGS) -MMD -S $< -o $@
-
 # border router rules
 $(CONTIKI)/tools/tunslip6:	$(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
@@ -96,10 +43,3 @@ connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/light-shutter-control/er-example-server.c

@@ -72,7 +72,6 @@
 #define REST_RES_LED 1
 #define REST_RES_BATTERY 1
 
-#include "erbium.h"
 #include "pcintkey.h"
 #include "statusled.h"
 

examples/osd/maclayertest/Makefile

@@ -69,10 +69,3 @@ connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-rout
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0 
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/merkurboard/Makefile

@@ -65,15 +65,19 @@ connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-rout
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0 
 
-avr-size-server: er-example-server.$(TARGET).sz
+avr-size-server: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).sz
 
-avr-size-client: er-example-server.$(TARGET).sz
+avr-size-client: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).sz
 
-flash-server: er-example-server.$(TARGET).u er-example-server.$(TARGET).eu
+flash-server: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).u \
+    er-example-server.$(TARGET)$(CUSTOM_SUFFIX).eu
 
-flash-client: er-example-client.$(TARGET).u er-example-client.$(TARGET).eu
+flash-client: er-example-client.$(TARGET)$(CUSTOM_SUFFIX).u \
+    er-example-client.$(TARGET)$(CUSTOM_SUFFIX).eu
 
 .PHONY: flash-client avr-size-client flash-server avr-size-server
-.PRECIOUS: er-example-server.$(TARGET).hex er-example-server.$(TARGET).eep \
+.PRECIOUS: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).hex \
-           er-example-client.$(TARGET).hex er-example-client.$(TARGET).eep
+    er-example-server.$(TARGET)$(CUSTOM_SUFFIX).eep \
+    er-example-client.$(TARGET)$(CUSTOM_SUFFIX).hex \
+    er-example-client.$(TARGET)$(CUSTOM_SUFFIX).eep
 

examples/osd/native-border-router/Makefile

@@ -25,11 +25,3 @@ include $(CONTIKI)/Makefile.include
 
 connect-router:	border-router.native
 	sudo ./border-router.native aaaa::1/64
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep
-

examples/osd/opentrigger-board/Makefile

@@ -61,10 +61,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/openvoting-box/Makefile

@@ -62,10 +62,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/pingtheplug/Makefile

@@ -48,10 +48,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/pir-sensor/Makefile

@@ -2,84 +2,16 @@ EXE=er-example-server
 
 all: $(EXE)
 
-# variable for this Makefile
-# configure CoAP implementation (3|7|12|13) (er-coap-07 also supports CoAP draft 08)
-WITH_COAP=13
-
-# for some platforms
-UIP_CONF_IPV6=1
-# IPv6 make config disappeared completely
-CFLAGS += -DUIP_CONF_IPV6=1
-
 CONTIKI=../../..
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
-# variable for Makefile.include
-ifneq ($(TARGET), minimal-net)
-CFLAGS += -DUIP_CONF_IPV6_RPL=1
-else
-# minimal-net does not support RPL under Linux and is mostly used to test CoAP only
-${info INFO: compiling without RPL}
-CFLAGS += -DUIP_CONF_IPV6_RPL=0
-CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\"
-${info INFO: compiling with large buffers}
-CFLAGS += -DUIP_CONF_BUFFER_SIZE=2048
-CFLAGS += -DREST_MAX_CHUNK_SIZE=1024
-CFLAGS += -DCOAP_MAX_HEADER_SIZE=640
-endif
-
 # linker optimizations
 SMALL=1
 
-# REST framework, requires WITH_COAP
+APPS += er-coap rest-engine json
-ifeq ($(WITH_COAP), 13)
-${info INFO: compiling with CoAP-13}
-CFLAGS += -DWITH_COAP=13
-CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap-13
-else ifeq ($(WITH_COAP), 12)
-${info INFO: compiling with CoAP-12}
-CFLAGS += -DWITH_COAP=12
-CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap-12
-else ifeq ($(WITH_COAP), 7)
-${info INFO: compiling with CoAP-08}
-CFLAGS += -DWITH_COAP=7
-CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap-07
-else ifeq ($(WITH_COAP), 3)
-${info INFO: compiling with CoAP-03}
-CFLAGS += -DWITH_COAP=3
-CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap-03
-else
-${info INFO: compiling with HTTP}
-CFLAGS += -DWITH_HTTP
-CFLAGS += -DREST=http_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=1
-APPS += er-http-engine
-endif
-
-APPS += erbium
-
-# optional rules to get assembly
-#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
-#CUSTOM_RULE_S_TO_OBJECTDIR_O = 1
 
 include $(CONTIKI)/Makefile.include
 
-# optional rules to get assembly
-#$(OBJECTDIR)/%.o: asmdir/%.S
-#	$(CC) $(CFLAGS) -MMD -c $< -o $@
-#	@$(FINALIZE_DEPENDENCY)
-#
-#asmdir/%.S: %.c
-#	$(CC) $(CFLAGS) -MMD -S $< -o $@
-
 # border router rules
 $(CONTIKI)/tools/tunslip6:	$(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
@@ -92,10 +24,3 @@ connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/pir-sensor/er-example-server.c

@@ -52,13 +52,6 @@
 #define REST_RES_TOGGLE 0
 #define REST_RES_BATTERY 1
 
-#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET) && !defined (CONTIKI_TARGET_NATIVE)
-#warning "Compiling with static routing!"
-#include "static-routing.h"
-#endif
-
-#include "erbium.h"
-
 #include "dev/led.h"
 #if defined (PLATFORM_HAS_BUTTON)
 #include "dev/button-sensor.h"
@@ -76,20 +69,6 @@
 #include "dev/battery-sensor.h"
 #endif
 
-
-/* For CoAP-specific example: not required for normal RESTful Web service. */
-#if WITH_COAP == 3
-#include "er-coap-03.h"
-#elif WITH_COAP == 7
-#include "er-coap-07.h"
-#elif WITH_COAP == 12
-#include "er-coap-12.h"
-#elif WITH_COAP == 13
-#include "er-coap-13.h"
-#else
-#warning "Erbium example without CoAP-specifc functionality"
-#endif /* CoAP-specific example */
-
 #define DEBUG 1
 #if DEBUG
 #define PRINTF(...) printf(__VA_ARGS__)

examples/osd/powerbox/Makefile

@@ -31,20 +31,8 @@ SMALL=1
 APPS += er-coap
 APPS += rest-engine
 
-# optional rules to get assembly
-#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
-#CUSTOM_RULE_S_TO_OBJECTDIR_O = 1
-
 include $(CONTIKI)/Makefile.include
 
-# optional rules to get assembly
-#$(OBJECTDIR)/%.o: asmdir/%.S
-#	$(CC) $(CFLAGS) -MMD -c $< -o $@
-#	@$(FINALIZE_DEPENDENCY)
-#
-#asmdir/%.S: %.c
-#	$(CC) $(CFLAGS) -MMD -S $< -o $@
-
 # border router rules
 $(CONTIKI)/tools/tunslip6:	$(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
@@ -57,10 +45,3 @@ connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/pwm-example/Makefile

@@ -11,19 +11,7 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
 PROJECT_SOURCEFILES += resource_led_pwm.c
 
-# variable for Makefile.include
-ifneq ($(TARGET), minimal-net)
 CFLAGS += -DUIP_CONF_IPV6_RPL=1
-else
-# minimal-net does not support RPL under Linux and is mostly used to test CoAP only
-${info INFO: compiling without RPL}
-CFLAGS += -DUIP_CONF_IPV6_RPL=0
-CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\"
-${info INFO: compiling with large buffers}
-CFLAGS += -DUIP_CONF_BUFFER_SIZE=2048
-CFLAGS += -DREST_MAX_CHUNK_SIZE=1024
-CFLAGS += -DCOAP_MAX_HEADER_SIZE=640
-endif
 
 # linker optimizations
 SMALL=1
@@ -46,10 +34,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/rpl-border-router/Makefile

@@ -47,10 +47,3 @@ connect-router:	$(CONTIKI)/tools/tunslip6
 
 connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 $(PREFIX)
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/servo-sensor/Makefile

@@ -9,42 +9,16 @@ CFLAGS += -DUIP_CONF_IPV6=1
 
 CONTIKI=../../..
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
-
-# variable for Makefile.include
-ifneq ($(TARGET), minimal-net)
 CFLAGS += -DUIP_CONF_IPV6_RPL=1
-else
-# minimal-net does not support RPL under Linux and is mostly used to test CoAP only
-${info INFO: compiling without RPL}
-CFLAGS += -DUIP_CONF_IPV6_RPL=0
-CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\"
-${info INFO: compiling with large buffers}
-CFLAGS += -DUIP_CONF_BUFFER_SIZE=2048
-CFLAGS += -DREST_MAX_CHUNK_SIZE=1024
-CFLAGS += -DCOAP_MAX_HEADER_SIZE=640
-endif
 
 # linker optimizations
 SMALL=1
 
-
 APPS += er-coap
 APPS += rest-engine
 
-# optional rules to get assembly
-#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
-#CUSTOM_RULE_S_TO_OBJECTDIR_O = 1
-
 include $(CONTIKI)/Makefile.include
 
-# optional rules to get assembly
-#$(OBJECTDIR)/%.o: asmdir/%.S
-#	$(CC) $(CFLAGS) -MMD -c $< -o $@
-#	@$(FINALIZE_DEPENDENCY)
-#
-#asmdir/%.S: %.c
-#	$(CC) $(CFLAGS) -MMD -S $< -o $@
-
 # border router rules
 $(CONTIKI)/tools/tunslip6:	$(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
@@ -57,10 +31,3 @@ connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/slip-radio/Makefile

@@ -26,10 +26,3 @@ endif
 CONTIKI_WITH_RPL = 0
 CONTIKI_WITH_IPV6 = 1
 include $(CONTIKI)/Makefile.include
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/wallclock-time/Makefile

@@ -38,11 +38,3 @@ connect-router-cooja: $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-# At some point we may want to include the eeprom file
-flash: $(EXE).$(TARGET).u # $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/week-clock/Makefile

@@ -24,19 +24,7 @@ REST_RESOURCES_FILES= $(notdir \
 PROJECTDIRS += $(REST_RESOURCES_DIR) $(REST_RESOURCES_DIR_COMMON)
 PROJECT_SOURCEFILES += $(REST_RESOURCES_FILES)
 
-# variable for Makefile.include
-ifneq ($(TARGET), minimal-net)
 CFLAGS += -DUIP_CONF_IPV6_RPL=1
-else
-# minimal-net does not support RPL under Linux and is mostly used to test CoAP only
-${info INFO: compiling without RPL}
-CFLAGS += -DUIP_CONF_IPV6_RPL=0
-CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\"
-${info INFO: compiling with large buffers}
-CFLAGS += -DUIP_CONF_BUFFER_SIZE=2048
-CFLAGS += -DREST_MAX_CHUNK_SIZE=1024
-CFLAGS += -DCOAP_MAX_HEADER_SIZE=640
-endif
 
 # linker optimizations
 SMALL=1
@@ -62,10 +50,3 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
-
-avr-size: $(EXE).$(TARGET).sz
-
-flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
-
-.PHONY: flash avr-size
-.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/wirelessplug/Makefile

@@ -91,15 +91,18 @@ connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
 
-avr-size-server: er-example-server.$(TARGET).sz
+avr-size-server: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).sz
 
-avr-size-client: er-example-server.$(TARGET).sz
+avr-size-client: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).sz
 
-flash-server: er-example-server.$(TARGET).u er-example-server.$(TARGET).eu
+flash-server: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).u \
+    er-example-server.$(TARGET)$(CUSTOM_SUFFIX).eu
 
-flash-client: er-example-client.$(TARGET).u er-example-client.$(TARGET).eu
+flash-client: er-example-client.$(TARGET)$(CUSTOM_SUFFIX).u \
+    er-example-client.$(TARGET)$(CUSTOM_SUFFIX).eu
 
 .PHONY: flash-client avr-size-client flash-server avr-size-server
-.PRECIOUS: er-example-server.$(TARGET).hex er-example-server.$(TARGET).eep \
+.PRECIOUS: er-example-server.$(TARGET)$(CUSTOM_SUFFIX).hex \
-           er-example-client.$(TARGET).hex er-example-client.$(TARGET).eep
+    er-example-server.$(TARGET)$(CUSTOM_SUFFIX).eep \
-
+    er-example-client.$(TARGET)$(CUSTOM_SUFFIX).hex \
+    er-example-client.$(TARGET)$(CUSTOM_SUFFIX).eep

examples/osd/wirelessplug/er-example-server.c

@@ -59,15 +59,6 @@
 #define REST_RES_BATTERY 0
 #define REST_RES_RADIO 0
 
-
-
-#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET) && !defined (CONTIKI_TARGET_NATIVE)
-#warning "Compiling with static routing!"
-#include "static-routing.h"
-#endif
-
-#include "erbium.h"
-
 // todo OSD-Testboard move to platform/dev
 #include "dev/led.h"
 #if REST_RES_DS1820
@@ -95,19 +86,6 @@
 
 #include "relay.h"
 
-/* For CoAP-specific example: not required for normal RESTful Web service. */
-#if WITH_COAP == 3
-#include "er-coap-03.h"
-#elif WITH_COAP == 7
-#include "er-coap-07.h"
-#elif WITH_COAP == 12
-#include "er-coap-12.h"
-#elif WITH_COAP == 13
-#include "er-coap-13.h"
-#else
-#warning "Erbium example without CoAP-specifc functionality"
-#endif /* CoAP-specific example */
-
 #define DEBUG 0
 #if DEBUG
 #define PRINTF(...) printf(__VA_ARGS__)