Override source file sets of included apps to exclude source files that would cause symbols to be defined twice in the Contiki library.

This commit is contained in:
oliverschmidt 2009-03-01 23:36:47 +00:00
parent eab1ea8c95
commit 62662ee79b

View File

@ -9,14 +9,22 @@ shell_src = shell.c shell-reboot.c \
#shell-rsh.c
shell_dsc = shell-dsc.c
APPS+=webbrowser webserver irc
APPS += webbrowser
include $(CONTIKI)/apps/webbrowser/Makefile.webbrowser
include $(CONTIKI)/apps/webserver/Makefile.webserver
include $(CONTIKI)/apps/irc/Makefile.irc
ifndef PLATFORM_BUILD
override webserver_src = webserver-nogui.c http-strings.c psock.c memb.c \
httpd-cfs.c
override webbrowser_src = webclient.c http-strings.c http-user-agent-string.c
endif
APPS += webserver
include $(CONTIKI)/apps/webserver/Makefile.webserver
ifndef PLATFORM_BUILD
override webserver_src = http-strings.c psock.c memb.c httpd-cfs.c
endif
APPS += irc
include $(CONTIKI)/apps/irc/Makefile.irc
ifndef PLATFORM_BUILD
override irc_src = ircc.c psock.c ircc-strings.c
endif
ifeq ($(TARGET),sky)