From 3caf77a60bdf6093030db08a0b272e70af48ac04 Mon Sep 17 00:00:00 2001 From: maniacbug Date: Mon, 8 Aug 2011 23:55:19 -0400 Subject: [PATCH] Added 'webserver6' to CONTIKI_PROJECT. This enables make upload. --- examples/webserver-ipv6/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/webserver-ipv6/Makefile b/examples/webserver-ipv6/Makefile index 697b5172e..549656638 100644 --- a/examples/webserver-ipv6/Makefile +++ b/examples/webserver-ipv6/Makefile @@ -1,4 +1,5 @@ -all: webserver6 $(WITH_WEBSERVER) +CONTIKI_PROJECT=webserver6 +all: $(CONTIKI_PROJECT) $(WITH_WEBSERVER) ifeq ($(WITH_WEBSERVER),) # @@ -22,14 +23,13 @@ ifeq ($(WITH_WEBSERVER),raven-webserver) APPS+=raven-lcd-interface endif #copy output to e.g. webserver-nano.sky, raven-webserver.avr-raven -$(WITH_WEBSERVER) : webserver6 - cp webserver6.$(TARGET) $(WITH_WEBSERVER).$(TARGET) +$(WITH_WEBSERVER) : $(CONTIKI_PROJECT) + cp $(CONTIKI_PROJECT).$(TARGET) $(WITH_WEBSERVER).$(TARGET) else APPS=webserver endif UIP_CONF_IPV6=1 DEFINES=WITH_UIP6 - CONTIKI = ../.. include $(CONTIKI)/Makefile.include