From 32701dacb5cb7c7e995cdee442ef20114b1ef493 Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Wed, 29 Sep 2010 11:53:39 +0000 Subject: [PATCH] Fixed recent build error in example-shell. 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 ;-) --- apps/shell/Makefile.shell | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/shell/Makefile.shell b/apps/shell/Makefile.shell index 1ddee2b1e..7a6a18c79 100644 --- a/apps/shell/Makefile.shell +++ b/apps/shell/Makefile.shell @@ -13,18 +13,18 @@ shell_src = shell.c shell-reboot.c \ shell-netperf.c shell-memdebug.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 include $(CONTIKI)/apps/webserver/Makefile.webserver ifndef PLATFORM_BUILD override webserver_src = http-strings.c psock.c memb.c httpd-cfs.c urlconv.c webserver-nogui.c 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 include $(CONTIKI)/apps/irc/Makefile.irc ifndef PLATFORM_BUILD