32701dacb5
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 ;-)
45 lines
1.5 KiB
Text
45 lines
1.5 KiB
Text
shell_src = shell.c shell-reboot.c \
|
|
shell-vars.c shell-ps.c shell-rime.c shell-sendtest.c \
|
|
shell-blink.c shell-text.c shell-time.c \
|
|
shell-file.c shell-netfile.c shell-run.c \
|
|
shell-rime-ping.c shell-rime-sniff.c shell-rime-netcmd.c \
|
|
shell-rime-debug.c shell-rime-debug-runicast.c shell-coffee.c \
|
|
shell-wget.c shell-httpd.c shell-irc.c \
|
|
shell-checkpoint.c shell-power.c \
|
|
shell-tcpsend.c shell-udpsend.c shell-ping.c shell-netstat.c \
|
|
shell-rime-sendcmd.c shell-download.c shell-rime-neighbors.c \
|
|
shell-rime-unicast.c \
|
|
shell-tweet.c shell-base64.c \
|
|
shell-netperf.c shell-memdebug.c
|
|
shell_dsc = shell-dsc.c
|
|
|
|
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
|
|
override irc_src = ircc.c psock.c ircc-strings.c
|
|
endif
|
|
|
|
APPS += telnet
|
|
include $(CONTIKI)/apps/telnet/Makefile.telnet
|
|
ifndef PLATFORM_BUILD
|
|
override telnet_src = telnet.c
|
|
endif
|
|
|
|
APPS += twitter
|
|
include $(CONTIKI)/apps/twitter/Makefile.twitter
|
|
|
|
ifeq ($(TARGET),sky)
|
|
shell_src += shell-sky.c shell-exec.c shell-sensortweet.c
|
|
endif
|