Revert "Separating coap code from mbed-client-c"

This reverts commit 20fe9f8.

Author: Yogesh Pande

Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile for combined NSDL library
+# Makefile for combined NSDL+COAP library
 #
 
 # Define compiler toolchain with CC or PLATFORM variables
@@ -19,15 +19,18 @@ 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 \
 
 override CFLAGS += -DVERSION='"$(VERSION)"'
 
 override CFLAGS += -Isource/libNsdl/src/include/
+override CFLAGS += -Isource/libCoap/src/include/
 SERVLIB_DIR := ../libService
 override CFLAGS += -I$(SERVLIB_DIR)/libService
 override CFLAGS += -Insdl-c/
-override CFLAGS += -I../libcoap/libcoap/
-override CFLAGS += -I../libcoap/source/include/
 
 include ../libService/toolchain_rules.mk
 

doxygen/client-c_doxy

@@ -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 Client C library"
+PROJECT_BRIEF          = "mbed Server c Client 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 

module.json

@@ -1,21 +1,21 @@
 {
   "name": "mbed-client-c",
   "version": "4.0.0",
-  "description": "Nanostack NSDL library",
+  "description": "Nanostack NSDL and COAP library",
   "keywords": [
     "coap",
     "nanostack"
   ],
   "license": "Apache-2.0",
   "extraIncludes": [
     "nsdl-c",
-    "source/libNsdl/src/include"
+    "source/libNsdl/src/include",
+    "source/libCoap/src/include"
   ],
   "dependencies": {
     "nanostack-libservice": "^3.0.0",
     "mbed-trace": ">=0.2.0,<2.0.0",
-    "nanostack-randlib": "^1.2.0",
-    "libcoap": "^1.0.0"
+    "nanostack-randlib": "^1.2.0"
   },
   "targetDependencies": {}
 }