merge master code to build iotivity

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

diff --git a/resource/csdk/security/SConscript b/resource/csdk/security/SConscript
index 379aec5..033a4d7 100644 (file)
--- a/resource/csdk/security/SConscript
+++ b/resource/csdk/security/SConscript
@@ -40,7 +40,7 @@ if target_os == 'arduino':
 ######################################################################
 libocsrm_env.PrependUnique(CPPPATH = [
                '../../../extlibs/cjson/',
-#              '../../../extlibs/tinydtls/',
+               '../../../extlibs/tinydtls/',
                '../logger/include',
                '../ocrandom/include',
                '../stack/include',
@@ -82,19 +82,44 @@ if not env.get('RELEASE'):
 # Source files and Targets
 ######################################################################
 OCSRM_SRC = 'src/'
-libocsrm_src = [
-       OCSRM_SRC + 'secureresourcemanager.c',
-       OCSRM_SRC + 'resourcemanager.c',
-       OCSRM_SRC + 'aclresource.c',
-       OCSRM_SRC + 'pstatresource.c',
-       OCSRM_SRC + 'doxmresource.c',
-       OCSRM_SRC + 'credresource.c',
-       OCSRM_SRC + 'policyengine.c',
-       OCSRM_SRC + 'psinterface.c',
-       OCSRM_SRC + 'srmresourcestrings.c',
-       OCSRM_SRC + 'srmutility.c',
-       OCSRM_SRC + 'base64.c'
-       ]
+if env.get('SECURED') == '1':
+       libocsrm_src = [
+               OCSRM_SRC + 'secureresourcemanager.c',
+               OCSRM_SRC + 'resourcemanager.c',
+               OCSRM_SRC + 'aclresource.c',
+               OCSRM_SRC + 'amaclresource.c',
+               OCSRM_SRC + 'pstatresource.c',
+               OCSRM_SRC + 'doxmresource.c',
+               OCSRM_SRC + 'credresource.c',
+               OCSRM_SRC + 'svcresource.c',
+               OCSRM_SRC + 'policyengine.c',
+               OCSRM_SRC + 'psinterface.c',
+               OCSRM_SRC + 'srmresourcestrings.c',
+               OCSRM_SRC + 'srmutility.c',
+               OCSRM_SRC + 'iotvticalendar.c',
+               OCSRM_SRC + 'oxmpincommon.c',
+               OCSRM_SRC + 'base64.c',
+               #pbkdf2.c is required to PIN based OxM only.
+               #But we did not use a separate build options to prevent the build command becomes complicated.
+               OCSRM_SRC + 'pbkdf2.c'
+               ]
+else:
+       libocsrm_src = [
+               OCSRM_SRC + 'secureresourcemanager.c',
+               OCSRM_SRC + 'resourcemanager.c',
+               OCSRM_SRC + 'aclresource.c',
+               OCSRM_SRC + 'amaclresource.c',
+               OCSRM_SRC + 'pstatresource.c',
+               OCSRM_SRC + 'doxmresource.c',
+               OCSRM_SRC + 'credresource.c',
+               OCSRM_SRC + 'svcresource.c',
+               OCSRM_SRC + 'policyengine.c',
+               OCSRM_SRC + 'psinterface.c',
+               OCSRM_SRC + 'srmresourcestrings.c',
+               OCSRM_SRC + 'srmutility.c',
+               OCSRM_SRC + 'iotvticalendar.c',
+               OCSRM_SRC + 'base64.c'
+               ]
 
 libocsrm = libocsrm_env.StaticLibrary('libocsrm', libocsrm_src)