X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Futil%2FSConscript;h=d7a121c246f8b8908c03bb28c7ec5b1e552d204e;hb=c315c87e07c4080ecd0ef488e7a1047bc3c509b2;hp=6305edbd010229f32684712724664c0a3523c648;hpb=44d29de2862a1791742d1bf001de35fc549601f0;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/connectivity/util/SConscript b/resource/csdk/connectivity/util/SConscript
index 6305edb..d7a121c 100644
--- a/resource/csdk/connectivity/util/SConscript
+++ b/resource/csdk/connectivity/util/SConscript
@@ -9,36 +9,44 @@ print "Reading util folder script"
 
 ca_os = env.get('TARGET_OS')
 ca_transport = env.get('TARGET_TRANSPORT')
+target_os = env.get('TARGET_OS')
 project_root = env.get('SRC_DIR')
 root_dir = os.path.join(project_root, 'resource', 'csdk', 'connectivity')
 src_dir = os.path.join(root_dir, 'util', 'src')
 
-env.PrependUnique(CPPPATH = [ os.path.join(root_dir, 'api') ])
-env.AppendUnique(CPPPATH = [ os.path.join(root_dir, 'inc'),
-                             os.path.join(project_root, 'resource', 'csdk', 'logger', 'include'),
-                             os.path.join(root_dir, 'lib', 'libcoap-4.1.1'),
-                             os.path.join(root_dir, 'common', 'inc'),
-                             os.path.join(root_dir, 'util', 'inc') ])
-
 ######################################################################
 # Source files to build common for platforms
 ######################################################################
 
-env.AppendUnique(CA_SRC = [os.path.join('./../util/src','cautilinterface.c')])
-
-if (('BLE' in ca_transport) or ('ALL' in ca_transport)):
-    if ca_os in ['linux', 'tizen', 'arduino']:
-    		env.AppendUnique(CA_SRC = [
-    		os.path.join(src_dir, 'camanager', ca_os, 'caleconnectionmanager.c')])
-
-    if ca_os == 'android':
-    		env.AppendUnique(CA_SRC = [
-    		os.path.join(src_dir, 'camanager', 'android', 'caleconnectionmanager.c'),
-    		os.path.join(src_dir, 'camanager', 'android', 'caleautoconnector.c'),
-    		os.path.join(src_dir, 'camanager', 'android', 'camanagerleutil.c'),
-    		os.path.join(src_dir, 'camanager', 'android', 'camanagerdevice.c')])
-
-if (('BT' in ca_transport) or ('ALL' in ca_transport)):
-    if ca_os == 'android':
-    		env.AppendUnique(CA_SRC = [
-    		os.path.join(src_dir, 'btpairing' ,'android', 'cabtpairing.c')])
+env.AppendUnique(CA_SRC = [os.path.join('./../util/src/cautilinterface.c')])
+
+if target_os == 'android':
+	if (('BLE' in ca_transport) or ('ALL' in ca_transport)):
+			env.AppendUnique(CA_SRC = [
+			os.path.join(src_dir, 'camanager', 'bt_le_manager', 'android', 'caleconnectionmanager.c'),
+			os.path.join(src_dir, 'camanager', 'bt_le_manager', 'android', 'caleautoconnector.c'),
+			os.path.join(src_dir, 'camanager', 'bt_le_manager', 'android', 'camanagerleutil.c'),
+			os.path.join(src_dir, 'camanager', 'bt_le_manager', 'android', 'camanagerdevice.c')])
+
+	if (('BT' in ca_transport) or ('ALL' in ca_transport)):
+			env.AppendUnique(CA_SRC = [
+			os.path.join(src_dir, 'btpairing' ,'android', 'cabtpairing.c')])
+
+if target_os == 'ios':
+	if (('BLE' in ca_transport) or ('ALL' in ca_transport)):
+			env.AppendUnique(CA_SRC = [
+			os.path.join(src_dir, 'camanager', 'bt_le_manager', 'ios', 'caleconnectionmanager.m'),
+			os.path.join(src_dir, 'camanager', 'bt_le_manager', 'ios', 'caleautoconnector.m'),
+			os.path.join(src_dir, 'camanager', 'bt_le_manager', 'ios', 'camanagerleutil.m'),
+			os.path.join(src_dir, 'camanager', 'bt_le_manager', 'ios', 'camanagerdevice.m')])
+
+if target_os == 'tizen':
+	if (('BLE' in ca_transport) or ('ALL' in ca_transport)):
+			env.AppendUnique(CA_SRC = [
+			os.path.join(src_dir, 'camanager', 'bt_le_manager', 'tizen', 'caleconnectionmanager.c')])
+
+env.AppendUnique(CA_SRC = [
+		os.path.join(src_dir, 'camanager', 'caconnectionmanager.c'),
+		os.path.join(src_dir, 'camanager', 'camanagerutil.c'),
+		os.path.join(src_dir, 'camanager', 'camessagearbiter.c'),
+		os.path.join(src_dir, 'camanager', 'capolicymanager.c')])