Added 'webserver6' to CONTIKI_PROJECT. This enables make upload.

This commit is contained in:
maniacbug 2011-08-08 23:55:19 -04:00 committed by David Kopf
parent 0990896f54
commit 3caf77a60b

View file

@ -1,4 +1,5 @@
all: webserver6 $(WITH_WEBSERVER) CONTIKI_PROJECT=webserver6
all: $(CONTIKI_PROJECT) $(WITH_WEBSERVER)
ifeq ($(WITH_WEBSERVER),) ifeq ($(WITH_WEBSERVER),)
# #
@ -22,14 +23,13 @@ ifeq ($(WITH_WEBSERVER),raven-webserver)
APPS+=raven-lcd-interface APPS+=raven-lcd-interface
endif endif
#copy output to e.g. webserver-nano.sky, raven-webserver.avr-raven #copy output to e.g. webserver-nano.sky, raven-webserver.avr-raven
$(WITH_WEBSERVER) : webserver6 $(WITH_WEBSERVER) : $(CONTIKI_PROJECT)
cp webserver6.$(TARGET) $(WITH_WEBSERVER).$(TARGET) cp $(CONTIKI_PROJECT).$(TARGET) $(WITH_WEBSERVER).$(TARGET)
else else
APPS=webserver APPS=webserver
endif endif
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
DEFINES=WITH_UIP6 DEFINES=WITH_UIP6
CONTIKI = ../.. CONTIKI = ../..
include $(CONTIKI)/Makefile.include include $(CONTIKI)/Makefile.include