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

Fixed recent build error in example-shell.

Browse source 
Both apps/webbrowser and apps/webserver contain a http-strings.c. It seems unclear to me if the original intention was to have them identical (but then they should have been factored out in the first place) or if they were only very similiar by chance.

Anyway, currently webserver/http-strings.c is a clean superset of webbrowser/http-strings.c so if a project has both HTTP server and client parts it is desirable to use the webserver variant. In the case of apps/shell this can be archived by adding webserver *before* webbrowser to the APPS variable.

This seems like a hack to me - but the whole shell build qualifies as hack, doesn't it ;-)
This commit is contained in:
oliverschmidt 2010-09-29 11:53:39 +00:00
parent a6a2d5de9f
commit 32701dacb5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/shell/Makefile.shell
View file

@ -13,18 +13,18 @@ shell_src = shell.c shell-reboot.c \
shell-netperf.c shell-memdebug.c shell-netperf.c shell-memdebug.c
shell_dsc = shell-dsc.c shell_dsc = shell-dsc.c
APPS += webbrowser
include $(CONTIKI)/apps/webbrowser/Makefile.webbrowser
ifndef PLATFORM_BUILD
override webbrowser_src = webclient.c http-strings.c http-user-agent-string.c
endif
APPS += webserver APPS += webserver
include $(CONTIKI)/apps/webserver/Makefile.webserver include $(CONTIKI)/apps/webserver/Makefile.webserver
ifndef PLATFORM_BUILD ifndef PLATFORM_BUILD
override webserver_src = http-strings.c psock.c memb.c httpd-cfs.c urlconv.c webserver-nogui.c override webserver_src = http-strings.c psock.c memb.c httpd-cfs.c urlconv.c webserver-nogui.c
endif endif
APPS += webbrowser
include $(CONTIKI)/apps/webbrowser/Makefile.webbrowser
ifndef PLATFORM_BUILD
override webbrowser_src = webclient.c http-strings.c http-user-agent-string.c
endif
APPS += irc APPS += irc
include $(CONTIKI)/apps/irc/Makefile.irc include $(CONTIKI)/apps/irc/Makefile.irc
ifndef PLATFORM_BUILD ifndef PLATFORM_BUILD