Merge branch 'upstream' into tizen

[platform/upstream/iotivity.git] / resource / csdk / connectivity / src / SConscript

diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript
index 8c4309c..367590a 100644 (file)
--- a/resource/csdk/connectivity/src/SConscript
+++ b/resource/csdk/connectivity/src/SConscript
@@ -112,9 +112,6 @@ env.AppendUnique(CA_SRC = ca_common_src)
 
 if 'ALL' in ca_transport:
                transports = [ 'ip_adapter', 'bt_edr_adapter', 'bt_le_adapter']
-               if ca_os == 'linux':
-                       if with_tcp:
-                               transports.append ('tcp_adapter')
                if with_ra:
                                transports.append ('ra_adapter')
                env.SConscript(dirs = [
@@ -129,6 +126,9 @@ if 'BT' in ca_transport:
 if 'BLE' in ca_transport:
        env.SConscript(os.path.join(ca_path, 'bt_le_adapter/SConscript'))
 
+if ca_os in ['linux', 'tizen']:
+       if with_tcp == True:
+               env.SConscript(os.path.join(ca_path, 'tcp_adapter/SConscript'))
 
 print "Include path is %s" % env.get('CPPPATH')
 print "Files path is %s" % env.get('CA_SRC')