From 6b34b4f092ef630db55df94607040f6e377f649b Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Sun, 9 Nov 2008 12:38:02 +0000
Subject: [PATCH] Added httpd and wget commands

---
 apps/shell/Makefile.shell | 10 +++++++++-
 apps/shell/shell.h        |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/shell/Makefile.shell b/apps/shell/Makefile.shell
index 1dd2daf3f..0317dc229 100644
--- a/apps/shell/Makefile.shell
+++ b/apps/shell/Makefile.shell
@@ -3,10 +3,18 @@ shell_src = shell.c shell-reboot.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-coffee.c
+            shell-rime-debug.c shell-coffee.c \
+            shell-wget.c shell-httpd.c
             #shell-rsh.c
 shell_dsc = shell-dsc.c
 
+APPS+=webbrowser webserver
+include $(CONTIKI)/apps/webbrowser/Makefile.webbrowser
+include $(CONTIKI)/apps/webserver/Makefile.webserver
+
+override webserver_src = webserver-nogui.c http-strings.c psock.c memb.c \
+                         httpd-cfs.c
+
 ifeq ($(TARGET),sky)
 	shell_src += shell-sky.c shell-exec.c
 endif
diff --git a/apps/shell/shell.h b/apps/shell/shell.h
index 9c7359042..94afdadd4 100644
--- a/apps/shell/shell.h
+++ b/apps/shell/shell.h
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell.h,v 1.9 2008/07/10 16:56:27 adamdunkels Exp $
+ * $Id: shell.h,v 1.10 2008/11/09 12:38:02 adamdunkels Exp $
  */
 
 /**
@@ -103,6 +103,7 @@ struct shell_input {
 #include "shell-coffee.h"
 #include "shell-exec.h"
 #include "shell-file.h"
+#include "shell-httpd.h"
 #include "shell-netfile.h"
 #include "shell-ps.h"
 #include "shell-reboot.h"
@@ -118,5 +119,6 @@ struct shell_input {
 #include "shell-text.h"
 #include "shell-time.h"
 #include "shell-vars.h"
+#include "shell-wget.h"
 
 #endif /* __SHELL_H__ */