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

Separating coap code from mbed-client-c #125

Merged
merged 2 commits into from
Feb 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Makefile for combined NSDL+COAP library
# Makefile for combined NSDL library
#

# Define compiler toolchain with CC or PLATFORM variables
Expand All @@ -17,20 +17,17 @@

LIB = libnsdl.a
SRCS := \
source/libNsdl/src/sn_grs.c \
source/libNsdl/src/sn_nsdl.c \
source/libCoap/src/sn_coap_protocol.c \
source/libCoap/src/sn_coap_parser.c \
source/libCoap/src/sn_coap_header_check.c \
source/libCoap/src/sn_coap_builder.c \
source/sn_grs.c \
source/sn_nsdl.c \

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

override CFLAGS += -Isource/libNsdl/src/include/
override CFLAGS += -Isource/libCoap/src/include/
override CFLAGS += -Isource/include/
SERVLIB_DIR := ../libService
override CFLAGS += -I$(SERVLIB_DIR)/libService
override CFLAGS += -Insdl-c/
override CFLAGS += -I../mbed-coap
override CFLAGS += -I../mbed-coap/source/include/

include ../libService/toolchain_rules.mk

Expand Down
2 changes: 1 addition & 1 deletion doxygen/client-c_doxy
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NUMBER =
# for a project that appears at the top of each page and should give viewer
# a quick idea about the purpose of the project. Keep the description short.

PROJECT_BRIEF = "mbed Server c Client library"
PROJECT_BRIEF = "mbed Client C library"

# With the PROJECT_LOGO tag one can specify an logo or icon that is
# included in the documentation. The maximum height of the logo should not
Expand Down
1 change: 1 addition & 0 deletions mbed-coap.lib
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://github.com/ARMmbed/mbed-coap/#12c87e057e0c6fef523457cd04651fdc9412901f
10 changes: 3 additions & 7 deletions module.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
{
"name": "mbed-client-c",
"version": "4.0.0",
"description": "Nanostack NSDL and COAP library",
"description": "Nanostack NSDL library",
"keywords": [
"coap",
"nanostack"
],
"license": "Apache-2.0",
"extraIncludes": [
"nsdl-c",
"source/libNsdl/src/include",
"source/libCoap/src/include"
"source/include"
],
"dependencies": {
"nanostack-libservice": "^3.0.0",
"mbed-trace": ">=0.2.0,<2.0.0",
"nanostack-randlib": "^1.2.0"
"mbed-coap": "^4.0.0"
},
"targetDependencies": {}
}
Loading