replace : iotivity -> iotivity-sec

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

diff --git a/resource/csdk/connectivity/common/SConscript b/resource/csdk/connectivity/common/SConscript
index f082dd8..3cdeef1 100644 (file)
--- a/resource/csdk/connectivity/common/SConscript
+++ b/resource/csdk/connectivity/common/SConscript
@@ -7,65 +7,35 @@ Import('env')
 print "Reading common folder script"
 
 ca_os = env.get('TARGET_OS')
-
+src_dir = env.get('SRC_DIR')
 root_dir = './../'
 
 
 ca_common_path = root_dir + 'common/'
 ca_common_src_path = ca_common_path + 'src/'
-no_glib = 'darwin,ios'
 
 env.AppendUnique(CPPPATH = [
+       '#resource/c_common/octhread/include/',
        'common/inc/',
+       src_dir + '/resource/csdk/logger/include/',
        ])
-       
-if ca_os == 'android':
-       main_dir  = Dir('.').srcnode().abspath
-       glib_dir = main_dir + '/../../../../extlibs/glib/glib-2.40.2/'
-       env.AppendUnique(CPPPATH = [
-                                       glib_dir,
-                                       glib_dir + 'glib',
-                                       glib_dir + 'gthread'])
-
-temp = env['CPPPATH']
-header = ' '
-for item in temp:
-       header = header + ' -I' + item
 
 ######################################################################
 # Source files and Target(s)
 ######################################################################
 ca_common_src = [
-               ca_common_src_path + 'oic_malloc.c',
-               ca_common_src_path + 'oic_string.c',
                ca_common_src_path + 'uarraylist.c',
+               ca_common_src_path + 'ulinklist.c',
                ca_common_src_path + 'uqueue.c',
+               ca_common_src_path + 'caremotehandler.c'
        ]
 
-if ca_os == 'arduino':
-       env.Command(env.get('BUILD_DIR') + 'logger.c.o', None, '$CXX -o ' + env.get('BUILD_DIR') + 'logger.c.o' + ' $LINKFLAGS  $CCFLAGS  $CXXFLAGS ' + '-I' + Dir('.').srcnode().path + '/inc' + header + ' ' + Dir('.').srcnode().path + '/src/logger.c')
+if env['POSIX_SUPPORTED'] or ca_os in ['windows']:
        platform_src = [
-               env.get('BUILD_DIR') + 'logger.c.o',
+               ca_common_src_path + 'cathreadpool_pthreads.c',
        ]
 else:
-       if ca_os in no_glib:
-               platform_src = [
-                                       ca_common_src_path + 'logger.c',
-                                       ca_common_src_path + 'oic_logger.c',
-                                       ca_common_src_path + 'oic_console_logger.c',
-                                       ca_common_src_path + 'uthreadpool.c',
-                                       ca_common_src_path + 'camutex_pthread.c'
-               ]
-       else:
-               platform_src = [
-                                       ca_common_src_path + 'logger.c',
-                                       ca_common_src_path + 'oic_logger.c',
-                                       ca_common_src_path + 'oic_console_logger.c',
-                                       ca_common_src_path + 'uthreadpool.c',
-                                       ca_common_src_path + 'camutex_glib.c'
-               ]
-
+       platform_src = []
 
 env.AppendUnique(CA_SRC = ca_common_src)
 env.AppendUnique(CA_SRC = platform_src)
-