X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Feasy-setup%2Fenrollee%2FSConscript;h=b2401f2c960316e63fa2b8b7bdc8f384ff62cadf;hb=8229635f6d207516ccbbdf23b13be164e0fc1787;hp=50a2e6f9fd061de7cdf0dda64f39f1033f6d04d6;hpb=e50d2e0691efe9f522307a612d4fef468d8ff840;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/easy-setup/enrollee/SConscript b/service/easy-setup/enrollee/SConscript
index 50a2e6f..b2401f2 100644
--- a/service/easy-setup/enrollee/SConscript
+++ b/service/easy-setup/enrollee/SConscript
@@ -46,19 +46,23 @@ enrollee_env.PrependUnique(CPPPATH = [
                 enrollee_env.get('SRC_DIR') + '/resource/csdk/stack/include',
                 enrollee_env.get('SRC_DIR') + '/resource/csdk/logger/include',
 		enrollee_env.get('SRC_DIR') + '/resource/csdk/security/include',
+		enrollee_env.get('SRC_DIR') + '/resource/csdk/connectivity/api',
 		enrollee_env.get('SRC_DIR') + '/extlibs/cjson',
-		enrollee_env.get('SRC_DIR') + '/extlibs/sqlite3',
 		enrollee_env.get('SRC_DIR') + '/service/easy-setup/inc',
 		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/inc',
-		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src'])
+		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src',
+		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/inc/samsung',
+		enrollee_env.get('SRC_DIR') + '/service/easy-setup/enrollee/src/samsung'])
+if target_os not in ['tizen']:
+    enrollee_env.PrependUnique(CPPPATH = [
+        enrollee_env.get('SRC_DIR') + '/extlibs/sqlite3'])
 
 if enrollee_env.get('SECURED') == '1':
 	enrollee_env.AppendUnique(CPPPATH = [
 		enrollee_env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include',
 		enrollee_env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include/internal',
 		enrollee_env.get('SRC_DIR') + '/resource/csdk/security/provisioning/include/oxm'])
-	if enrollee_env.get('WITH_TCP') == True:
-		enrollee_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
+	enrollee_env.AppendUnique(LIBS = ['mbedtls', 'mbedx509', 'mbedcrypto'])
 
 if target_os not in ['windows']:
 	enrollee_env.AppendUnique(CXXFLAGS = ['-Wall', '-std=c++0x'])
@@ -102,10 +106,13 @@ if target_os == 'arduino':
 es_enrollee_src = None
 
 if target_os in ['linux', 'tizen']:
-	es_enrollee_common_src = ['./src/easysetup.c','./src/resourcehandler.c']
+	es_enrollee_common_src = ['./src/easysetup.c','./src/resourcehandler.c', './src/samsung/sc_easysetup.c']
 	enrollee_sdk_shared = enrollee_env.SharedLibrary('ESEnrolleeSDK', es_enrollee_common_src)
-	enrollee_env.InstallTarget(enrollee_sdk_shared, 'libESEnrollee')
-	enrollee_env.UserInstallTargetLib(enrollee_sdk_shared, 'libESEnrollee')
+	enrollee_sdk_static = enrollee_env.StaticLibrary('ESEnrolleeSDK', es_enrollee_common_src)
+	enrollee_env.InstallTarget([enrollee_sdk_shared, enrollee_sdk_static], 'libESEnrollee')
+	enrollee_env.UserInstallTargetLib([enrollee_sdk_shared, enrollee_sdk_static], 'libESEnrollee')
+	enrollee_env.UserInstallTargetHeader('inc/ESEnrolleeCommon.h', 'service/easy-setup', 'ESEnrolleeCommon.h')
+	enrollee_env.UserInstallTargetHeader('inc/easysetup.h', 'service/easy-setup', 'easysetup.h')
 
 if target_os == 'arduino':
 	es_enrollee_common_src = ['./src/easysetup.c','./src/resourcehandler.c']
@@ -117,9 +124,10 @@ if target_os == 'arduino':
 #if target_os == 'arduino':
 #	SConscript('../sampleapp/enrollee/arduino/SConscript')
 
-if target_os in ['linux']:
-	SConscript('../sampleapp/enrollee/linux/SConscript')
-	#Build UnitTestcases for Enrollee
-	if enrollee_env.get('SECURED') == '0':
-		SConscript('../enrollee/unittests/SConscript')
+#if target_os in ['linux']:
+#	SConscript('../sampleapp/enrollee/linux/SConscript')
+#	SConscript('../sampleapp/enrollee/linux-samsung/SConscript')
+#	#Build UnitTestcases for Enrollee
+#	if enrollee_env.get('SECURED') == '0':
+#		SConscript('../enrollee/unittests/SConscript')