Enable security and Add csdk sample for security

[platform/upstream/iotivity.git] / resource / csdk / security / provisioning / SConscript

diff --git a/resource/csdk/security/provisioning/SConscript b/resource/csdk/security/provisioning/SConscript
index 0387090..9cc456f 100644 (file)
--- a/resource/csdk/security/provisioning/SConscript
+++ b/resource/csdk/security/provisioning/SConscript
@@ -65,7 +65,7 @@ if target_os not in ['windows', 'winrt']:
        # Note: 'pthread' is in libc for android. On other platform, if use
        # new gcc(>4.9?) it isn't required, otherwise, it's required
        if target_os != 'android':
-               provisioning_env.AppendUnique(LIBS = ['-lpthread'])
+               provisioning_env.AppendUnique(LIBS = ['-lpthread', '-ldl'])
 
 
 provisioning_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
@@ -74,9 +74,10 @@ provisioning_env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'connecti
 provisioning_env.AppendUnique(LIBS = ['tinydtls'])
 
 if env.get('DTLS_WITH_X509') == '1':
-       provisioning_env.AppendUnique(LIBS = ['CKManger'])
+       provisioning_env.AppendUnique(LIBS = ['CKManager', 'asn1'])
 
-provisioning_env.ParseConfig('pkg-config --libs glib-2.0')
+if target_os != 'android':
+       provisioning_env.ParseConfig('pkg-config --libs glib-2.0')
 
 if target_os == 'tizen':
        provisioning_env.ParseConfig('pkg-config --cflags --libs sqlite3')
@@ -86,7 +87,7 @@ if target_os == 'android':
        provisioning_env.AppendUnique(LIBS = ['gnustl_static'])
 
        if not env.get('RELEASE'):
-               provisioning_env.AppendUnique(LIBS = ['log'])
+               provisioning_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
 if target_os in ['darwin', 'ios']:
        provisioning_env.AppendUnique(CPPDEFINES = ['_DARWIN_C_SOURCE'])
@@ -107,7 +108,7 @@ provisioning_src = [
 if target_os != 'tizen':
        provisioning_src = provisioning_src + [root_dir+'/extlibs/sqlite3/sqlite3.c' ]
 
-provisioningserver = provisioning_env.StaticLibrary('ocpmapi', provisioning_src)
+provisioningserver = provisioning_env.SharedLibrary('ocpmapi', provisioning_src)
 
 provisioning_env.InstallTarget(provisioningserver, 'libocpmapi')
 provisioning_env.UserInstallTargetLib(provisioningserver, 'libocpmapi')
@@ -115,6 +116,6 @@ provisioning_env.UserInstallTargetLib(provisioningserver, 'libocpmapi')
 if env.get('DTLS_WITH_X509') == '1':
        SConscript('ck_manager/SConscript')
 
-if target_os in ['linux']:
+if target_os in ['linux', 'tizen']:
        SConscript('sample/SConscript')