From: Sashi Penta <sashi.kumar.penta@intel.com>
Date: Thu, 25 Dec 2014 02:12:41 +0000 (-0800)
Subject: Fix build issue
X-Git-Tag: 0.9.0-CA~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d3984e7e0e793894757d158df60c51496db1254;p=contrib%2Fiotivity.git

Fix build issue

Change-Id: Ie0d491d47417db82cf0ee2511e86efc6079c83be
Signed-off-by: Sashi Penta <sashi.kumar.penta@intel.com>
---

diff --git a/resource/csdk/stack/src/oicgroup.c b/resource/csdk/stack/src/oicgroup.c
index b9f70ac..5592ede 100644
--- a/resource/csdk/stack/src/oicgroup.c
+++ b/resource/csdk/stack/src/oicgroup.c
@@ -677,9 +677,15 @@ OCStackResult SendAction(OCDoHandle *handle, const char *targetUri, const unsign
     cbdata.cd = &ActionSetCD;
     cbdata.context = (void *) 0x99;
 
+#ifdef CA_INT
+    return OCDoResource(handle, OC_REST_PUT, targetUri,
+    //temp->rsrcType->resourcetypename,
+            NULL, (char *) action, OC_WIFI | OC_ETHERNET, OC_NA_QOS, &cbdata, NULL, 0);
+#else
     return OCDoResource(handle, OC_REST_PUT, targetUri,
     //temp->rsrcType->resourcetypename,
             NULL, (char *) action, OC_NA_QOS, &cbdata, NULL, 0);
+#endif
 }
 
 OCStackResult BuildCollectionGroupActionJSONResponse(OCMethod method/*OCEntityHandlerFlag flag*/,
diff --git a/service/protocol-plugin/sample-app/linux/SConscript b/service/protocol-plugin/sample-app/linux/SConscript
index 2e6b311..8b3cf05 100644
--- a/service/protocol-plugin/sample-app/linux/SConscript
+++ b/service/protocol-plugin/sample-app/linux/SConscript
@@ -9,6 +9,7 @@ lib_env = env.Clone()
 SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
 
 sample_env = lib_env.Clone()
+
 target_os = env.get('TARGET_OS')
 ######################################################################
 # Build flags
@@ -21,11 +22,16 @@ if target_os not in ['windows', 'winrt']:
 	sample_env.AppendUnique(CXXFLAGS = ['-Wall', '-pthread', '-std=c++0x'])
 
 sample_env.AppendUnique(LIBS = ['pthread'])
-sample_env.AppendUnique(LIBS = ['oc', 'oc_logger', 'octbstack', 'coap', 'ppm', 'pmimpl', 'dl'])
+sample_env.AppendUnique(LIBS = ['oc', 'oc_logger', 'octbstack', 'coap', 'coap_csdk',
+								'connectivity_abstraction',
+								'ppm', 'pmimpl', 'dl'])
+
+sample_env.ParseConfig('pkg-config --libs glib-2.0')
+
 ######################################################################
 # Source files and Targets
 ######################################################################
 mqttclient = sample_env.Program('mqtt/mqttclient', 'mqtt/mqttclient.cpp')
 
 Alias('mqttclient', mqttclient)
-env.AppendTarget('mqttclient')
\ No newline at end of file
+env.AppendTarget('mqttclient')
diff --git a/service/things-manager/sampleapp/linux/configuration/SConscript b/service/things-manager/sampleapp/linux/configuration/SConscript
index d4a8c5d..852e467 100644
--- a/service/things-manager/sampleapp/linux/configuration/SConscript
+++ b/service/things-manager/sampleapp/linux/configuration/SConscript
@@ -18,7 +18,11 @@ linux_sample_env.AppendUnique(CPPPATH = ['../../../sdk/src'])
 linux_sample_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread'])
 linux_sample_env.AppendUnique(CPPDEFINES = ['LINUX'])
 linux_sample_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-linux_sample_env.AppendUnique(LIBS = ['libTGMSDKLibrary', 'oc', 'octbstack', 'libcoap', 'liboc_logger', 'dl', 'pthread'])
+linux_sample_env.AppendUnique(LIBS = ['libTGMSDKLibrary', 'oc', 'octbstack',
+										'connectivity_abstraction', 'coap_csdk',
+										'libcoap', 'liboc_logger', 'dl', 'pthread'])
+
+linux_sample_env.ParseConfig('pkg-config --libs glib-2.0')
 
 ######################################################################
 #build sampleapp
diff --git a/service/things-manager/sampleapp/linux/groupaction/SConscript b/service/things-manager/sampleapp/linux/groupaction/SConscript
index 1ed0695..2528b57 100644
--- a/service/things-manager/sampleapp/linux/groupaction/SConscript
+++ b/service/things-manager/sampleapp/linux/groupaction/SConscript
@@ -18,8 +18,11 @@ linux_sample_env.AppendUnique(CPPPATH = ['../../../sdk/src'])
 linux_sample_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread'])
 linux_sample_env.AppendUnique(CPPDEFINES = ['LINUX'])
 linux_sample_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-linux_sample_env.AppendUnique(LIBS = ['libTGMSDKLibrary', 'oc', 'octbstack', 'libcoap', 'liboc_logger', 'dl', 'pthread'])
+linux_sample_env.AppendUnique(LIBS = ['libTGMSDKLibrary', 'oc', 'octbstack',
+										'coap_csdk', 'connectivity_abstraction',
+										'libcoap', 'liboc_logger', 'dl', 'pthread'])
 
+linux_sample_env.ParseConfig('pkg-config --libs glib-2.0')
 
 ######################################################################
 #build sampleapp
diff --git a/service/things-manager/sampleapp/linux/groupsyncaction/SConscript b/service/things-manager/sampleapp/linux/groupsyncaction/SConscript
index 25d9b49..cb0de89 100644
--- a/service/things-manager/sampleapp/linux/groupsyncaction/SConscript
+++ b/service/things-manager/sampleapp/linux/groupsyncaction/SConscript
@@ -18,8 +18,11 @@ linux_sample_env.AppendUnique(CPPPATH = ['../../../sdk/src'])
 linux_sample_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread'])
 linux_sample_env.AppendUnique(CPPDEFINES = ['LINUX'])
 linux_sample_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-linux_sample_env.AppendUnique(LIBS = ['libTGMSDKLibrary', 'oc', 'octbstack', 'libcoap', 'liboc_logger', 'dl', 'pthread'])
+linux_sample_env.AppendUnique(LIBS = ['libTGMSDKLibrary', 'oc', 'octbstack',
+                                        'coap_csdk', 'connectivity_abstraction',
+                                        'libcoap', 'liboc_logger', 'dl', 'pthread'])
 
+linux_sample_env.ParseConfig('pkg-config --libs glib-2.0')
 
 ######################################################################
 #build sampleapp