Skip to content
This repository was archived by the owner on Apr 24, 2019. It is now read-only.

Commit 664d47f

Browse files
authored
Merge pull request #125 from ARMmbed/mbed-coap-separation
Separating coap code from mbed-client-c
2 parents 4fdefc8 + 7b26f09 commit 664d47f

35 files changed

+25
-9255
lines changed

Makefile

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Makefile for combined NSDL+COAP library
2+
# Makefile for combined NSDL library
33
#
44

55
# Define compiler toolchain with CC or PLATFORM variables
@@ -17,20 +17,17 @@
1717

1818
LIB = libnsdl.a
1919
SRCS := \
20-
source/libNsdl/src/sn_grs.c \
21-
source/libNsdl/src/sn_nsdl.c \
22-
source/libCoap/src/sn_coap_protocol.c \
23-
source/libCoap/src/sn_coap_parser.c \
24-
source/libCoap/src/sn_coap_header_check.c \
25-
source/libCoap/src/sn_coap_builder.c \
20+
source/sn_grs.c \
21+
source/sn_nsdl.c \
2622

2723
override CFLAGS += -DVERSION='"$(VERSION)"'
2824

29-
override CFLAGS += -Isource/libNsdl/src/include/
30-
override CFLAGS += -Isource/libCoap/src/include/
25+
override CFLAGS += -Isource/include/
3126
SERVLIB_DIR := ../libService
3227
override CFLAGS += -I$(SERVLIB_DIR)/libService
3328
override CFLAGS += -Insdl-c/
29+
override CFLAGS += -I../mbed-coap
30+
override CFLAGS += -I../mbed-coap/source/include/
3431

3532
include ../libService/toolchain_rules.mk
3633

doxygen/client-c_doxy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NUMBER =
3838
# for a project that appears at the top of each page and should give viewer
3939
# a quick idea about the purpose of the project. Keep the description short.
4040

41-
PROJECT_BRIEF = "mbed Server c Client library"
41+
PROJECT_BRIEF = "mbed Client C library"
4242

4343
# With the PROJECT_LOGO tag one can specify an logo or icon that is
4444
# included in the documentation. The maximum height of the logo should not

mbed-coap.lib

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/ARMmbed/mbed-coap/#12c87e057e0c6fef523457cd04651fdc9412901f

module.json

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
{
22
"name": "mbed-client-c",
33
"version": "4.0.0",
4-
"description": "Nanostack NSDL and COAP library",
4+
"description": "Nanostack NSDL library",
55
"keywords": [
6-
"coap",
76
"nanostack"
87
],
98
"license": "Apache-2.0",
109
"extraIncludes": [
1110
"nsdl-c",
12-
"source/libNsdl/src/include",
13-
"source/libCoap/src/include"
11+
"source/include"
1412
],
1513
"dependencies": {
16-
"nanostack-libservice": "^3.0.0",
17-
"mbed-trace": ">=0.2.0,<2.0.0",
18-
"nanostack-randlib": "^1.2.0"
14+
"mbed-coap": "^4.0.0"
1915
},
2016
"targetDependencies": {}
2117
}

0 commit comments

Comments
 (0)