Move http to os/net/app-layer

2017-09-01 16:45:44 +02:00 · 2017-09-01 16:45:44 +02:00 · ffe3b811b0
commit ffe3b811b0
parent 1987b316fd
7 changed files with 3 additions and 4 deletions
--- a/examples/http-socket/Makefile
+++ b/examples/http-socket/Makefile
@ -1,6 +1,6 @@
 all: http-example
 CONTIKI=../..
-APPS += http-socket
+MODULES += os/net/app-layer/http-socket

 CONTIKI_WITH_IPV6 = 1
 CONTIKI_WITH_RPL_LITE = 0
--- a/examples/ipv6/json-ws/Makefile
+++ b/examples/ipv6/json-ws/Makefile
@ -11,8 +11,7 @@ ifdef WITH_UDP
 PROJECT_SOURCEFILES += json-ws-udp.c
 endif

-APPS += httpd-ws
-MODULES += os/lib/json
+MODULES += os/lib/json os/net/app-layer/httpd-ws

 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"

--- a/examples/platform-specific/zoul/orion/client/Makefile
+++ b/examples/platform-specific/zoul/orion/client/Makefile
@ -4,7 +4,7 @@ all: $(CONTIKI_PROJECT)

 BOARD = orion

-APPS += http-socket
+MODULES += os/net/app-layer/http-socket

 WITH_IP64 = 1

--- a/os/net/app-layer/http-socket/http-socket.c
+++ b/os/net/app-layer/http-socket/http-socket.c
--- a/os/net/app-layer/http-socket/http-socket.h
+++ b/os/net/app-layer/http-socket/http-socket.h
--- a/os/net/app-layer/httpd-ws/httpd-ws.c
+++ b/os/net/app-layer/httpd-ws/httpd-ws.c
--- a/os/net/app-layer/httpd-ws/httpd-ws.h
+++ b/os/net/app-layer/httpd-ws/httpd-ws.h