giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move json to os/lib

This commit is contained in:
Simon Duquennoy 2017-09-01 16:01:11 +02:00
parent c528562908
commit bbd058a570
14 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/ipv6/json-ws/Makefile
View File

@ -11,7 +11,8 @@ ifdef WITH_UDP
PROJECT_SOURCEFILES += json-ws-udp.c
endif
APPS += httpd-ws json
APPS += httpd-ws
MODULES += os/lib/json
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"

3
examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
View File

@ -8,14 +8,13 @@ CONTIKI=../../../../..
CONTIKI_WITH_IPV6 = 1
MODULES += os/net/mac/tsch
MODULES += os/net/mac/tsch os/lib/json
PROJECTDIRS += .. ../tools
PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
CFLAGS += -DWITH_COAP
CFLAGS += -DUIP_CONF_TCP=0
APPS = json
APPS += er-coap
include $(CONTIKI)/Makefile.include

3
examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
View File

@ -8,14 +8,13 @@ CONTIKI=../../../../..
CONTIKI_WITH_IPV6 = 1
MODULES += os/net/mac/tsch
MODULES += os/net/mac/tsch os/lib/json
PROJECTDIRS += .. ../tools
PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
CFLAGS += -DWITH_COAP
CFLAGS += -DUIP_CONF_TCP=0
APPS = json
APPS += er-coap
include $(CONTIKI)/Makefile.include

3
examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
View File

@ -8,14 +8,13 @@ CONTIKI=../../../../..
CONTIKI_WITH_IPV6 = 1
MODULES += os/net/mac/tsch
MODULES += os/net/mac/tsch os/lib/json
PROJECTDIRS += .. ../tools
PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
CFLAGS += -DWITH_COAP
CFLAGS += -DUIP_CONF_TCP=0
APPS = json
APPS += er-coap
include $(CONTIKI)/Makefile.include

3
examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
View File

@ -13,10 +13,9 @@ PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DWITH_COAP
CFLAGS += -DREST=coap_rest_implementation
CFLAGS += -DUIP_CONF_TCP=0
APPS += json
APPS += er-coap
MODULES += os/net/mac/tsch os/services/orchestra
MODULES += os/net/mac/tsch os/services/orchestra os/lib/json
all: $(CONTIKI_PROJECT)

3
examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
View File

@ -15,10 +15,9 @@ PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DWITH_COAP
CFLAGS += -DREST=coap_rest_implementation
CFLAGS += -DUIP_CONF_TCP=0
APPS += json
APPS += er-coap
MODULES += os/net/mac/tsch os/services/orchestra
MODULES += os/net/mac/tsch os/services/orchestra os/lib/json
all: $(CONTIKI_PROJECT)
include $(CONTIKI)/Makefile.include

3
examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
View File

@ -13,10 +13,9 @@ PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DWITH_COAP
CFLAGS += -DREST=coap_rest_implementation
CFLAGS += -DUIP_CONF_TCP=0
APPS += json
APPS += er-coap
MODULES += os/net/mac/tsch os/services/orchestra
MODULES += os/net/mac/tsch os/services/orchestra os/lib/json
all: $(CONTIKI_PROJECT)

3
examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
View File

@ -16,10 +16,9 @@ PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DWITH_COAP
CFLAGS += -DREST=coap_rest_implementation
CFLAGS += -DUIP_CONF_TCP=0
APPS += json
APPS += er-coap
MODULES += os/net/mac/tsch os/services/orchestra
MODULES += os/net/mac/tsch os/services/orchestra os/lib/json
all: $(CONTIKI_PROJECT)
include $(CONTIKI)/Makefile.include

3
examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
View File

@ -14,10 +14,9 @@ PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DWITH_COAP
CFLAGS += -DREST=coap_rest_implementation
CFLAGS += -DUIP_CONF_TCP=0
APPS += json
APPS += er-coap
MODULES += os/net/mac/tsch os/services/orchestra
MODULES += os/net/mac/tsch os/services/orchestra os/lib/json
all: $(CONTIKI_PROJECT)

0
apps/json/json.h → os/lib/json/json.h
View File

0
apps/json/jsonparse.c → os/lib/json/jsonparse.c
View File

0
apps/json/jsonparse.h → os/lib/json/jsonparse.h
View File

0
apps/json/jsontree.c → os/lib/json/jsontree.c
View File

0
apps/json/jsontree.h → os/lib/json/jsontree.h
View File