Merge remote-tracking branch 'origin/routing-manager'

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

diff --git a/resource/csdk/connectivity/common/SConscript b/resource/csdk/connectivity/common/SConscript
index 4bf6cb1..d07c625 100644 (file)
--- a/resource/csdk/connectivity/common/SConscript
+++ b/resource/csdk/connectivity/common/SConscript
@@ -7,8 +7,11 @@ Import('env')
 print "Reading common folder script"
 
 ca_os = env.get('TARGET_OS')
+
 root_dir = './../'
-ca_common_path = root_dir + '/common/'
+
+
+ca_common_path = root_dir + 'common/'
 ca_common_src_path = ca_common_path + 'src/'
 
 env.AppendUnique(CPPPATH = [
@@ -19,30 +22,40 @@ 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', None, '$CXX -o ' + env.get('BUILD_DIR') + 'logger.c' + ' $LINKFLAGS  $CCFLAGS  $CXXFLAGS ' + header + ' ' + 'common/src/logger.c')
-       platform_src = [
+       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')
+       logger_src = [
                env.get('BUILD_DIR') + 'logger.c.o',
        ]
 else:
-       platform_src = [
+       logger_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 + 'umutex.c',
-               ca_common_src_path + 'uthreadpool.c',
+               ca_common_src_path + 'oic_console_logger.c'
+               ]
+
+if env['POSIX_SUPPORTED']:
+       platform_src = [
+               ca_common_src_path + 'cathreadpool_pthreads.c',
+               ca_common_src_path + 'camutex_pthreads.c'
        ]
+else:
+       platform_src = [
+               ca_common_src_path + 'camutex_noop.c'
+               ]
+
 
 env.AppendUnique(CA_SRC = ca_common_src)
+env.AppendUnique(CA_SRC = logger_src)
 env.AppendUnique(CA_SRC = platform_src)