deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
oliverschmidt 2009-03-01 23:36:47 +00:00
parent eab1ea8c95
commit 62662ee79b
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/shell/Makefile.shell
View file

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