X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fstack%2Fsamples%2Flinux%2FSimpleClientServer%2FSConscript;h=ba5da01f3fb3931f129b512041b7b88792580219;hb=8c01dff2c5bc5496f7dc1632c498943ec6ecb015;hp=b3250b77b6bad6fd060641d726810ae697ce68aa;hpb=935fdb9b67b6c10d007e652e9e2e028fd6ccfe09;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
index b3250b7..ba5da01 100644
--- a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
+++ b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
@@ -21,13 +21,13 @@
 Import('env')
 target_os = env.get('TARGET_OS')
 samples_env = env.Clone()
+with_ra = env.get ('WITH_RA')
 ######################################################################
 # Build flags
 ######################################################################
 samples_env.PrependUnique(CPPPATH = [
 		'../../../../logger/include',
 		'../../../../stack/include',
-		'../../../../ocmalloc/include',
 		'../../../../../../extlibs/cjson',
 		'../../../../../oc_logger/include',
 		'../../../../../connectivity/lib/libcoap-4.1.1'
@@ -39,9 +39,9 @@ samples_env.AppendUnique(LIBS = ['-lpthread' ])
 samples_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
 
 if target_os in ['darwin', 'ios']:
-	samples_env.PrependUnique(LIBS = ['m','octbstack', 'connectivity_abstraction','coap' ])
+	samples_env.PrependUnique(LIBS = ['m','octbstack', 'ocsrm', 'connectivity_abstraction','coap' ])
 elif target_os not in ['arduino']:
-	samples_env.PrependUnique(LIBS = ['m', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap'])
+	samples_env.PrependUnique(LIBS = ['m', 'octbstack', 'ocsrm', 'oc_logger', 'connectivity_abstraction', 'coap'])
 	samples_env.AppendUnique(LIBS = ['rt'])
 
 if env.get('SECURED') == '1':
@@ -60,12 +60,18 @@ ocservercoll     = samples_env.Program('ocservercoll', ['ocservercoll.cpp', 'com
 occlientcoll     = samples_env.Program('occlientcoll', ['occlientcoll.cpp', 'common.cpp'])
 ocserverbasicops = samples_env.Program('ocserverbasicops', ['ocserverbasicops.cpp', 'common.cpp'])
 occlientbasicops = samples_env.Program('occlientbasicops', ['occlientbasicops.cpp', 'common.cpp'])
+if with_ra:
+	ocremoteaccessclient = samples_env.Program('ocremoteaccessclient',
+						['ocremoteaccessclient.cpp','common.cpp'])
 
-Alias("samples", [ocserver, occlient,
+list_of_samples = [ocserver, occlient,
 				ocservercoll, occlientcoll,
 				ocserverbasicops, occlientbasicops,
 				ocserverslow, occlientslow
-                ])
+                ]
+if with_ra:
+	list_of_samples.append (ocremoteaccessclient)
+Alias("samples", list_of_samples)
 
 env.AppendTarget('samples')