X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fresource-directory%2FSConscript;h=9ff2552b180529c05637e6d4f66e77a200f349a1;hb=c52137bca74353f5e1128ecb115873ad17c31736;hp=83d809b7ed88ac8522016b634191fefc5c208bd5;hpb=7ee0263a0bd85f14417bcf2a5cbb33fdaca9b22e;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/resource-directory/SConscript b/resource/csdk/resource-directory/SConscript
index 83d809b..9ff2552 100755
--- a/resource/csdk/resource-directory/SConscript
+++ b/resource/csdk/resource-directory/SConscript
@@ -35,14 +35,15 @@ rd_mode = env.get('RD_MODE')
 ######################################################################
 # Build flags
 ######################################################################
-rd_env.AppendUnique(CPPPATH = ['include', 'src/internal', '../stack/include'])
+rd_env.AppendUnique(CPPPATH = ['include', 'src/internal', '../stack/include', '../../oc_logger/include'])
 
 if 'CLIENT' in rd_mode:
     rd_env.AppendUnique(CPPDEFINES = ['RD_CLIENT'])
 if 'SERVER' in rd_mode:
     rd_env.AppendUnique(CPPDEFINES = ['RD_SERVER'])
 
-rd_env.PrependUnique(LIBS = ['oc', 'octbstack', 'oc_logger', 'connectivity_abstraction', 'coap'])
+rd_env.AppendUnique(LIBPATH = [rd_env.get('BUILD_DIR')])
+rd_env.AppendUnique(LIBS = ['octbstack'])
 
 if target_os not in ['windows']:
     rd_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-Wextra'])
@@ -57,7 +58,7 @@ if target_os == 'android':
     if not env.get('RELEASE'):
         rd_env.AppendUnique(LIBS = ['log'])
 
-if target_os in ['tizen']:
+if target_os in ['linux', 'tizen']:
     rd_env.ParseConfig('pkg-config --cflags --libs sqlite3')
 else:
     rd_env.AppendUnique(CPPPATH = ['../../../extlibs/sqlite3'])
@@ -67,12 +68,15 @@ else:
 ######################################################################
 RD_SRC_DIR = 'src/'
 rd_src = []
+
 if 'SERVER' in rd_mode:
     rd_src += [
-            '../../../extlibs/sqlite3/sqlite3.c',
             RD_SRC_DIR + 'internal/rd_database.c',
             RD_SRC_DIR + 'rd_server.c',
             ]
+    if target_os not in ['linux', 'tizen'] :
+        rd_src += [ '../../../extlibs/sqlite3/sqlite3.c' ]
+
 if 'CLIENT' in rd_mode:
     rd_src += [RD_SRC_DIR + 'rd_client.c',]
 
@@ -83,6 +87,7 @@ else :
 
 rd_env.InstallTarget(rdsdk, 'resource_directory')
 rd_env.UserInstallTargetLib(rdsdk, 'resource_directory')
+
 if 'CLIENT' in rd_mode:
     rd_env.UserInstallTargetHeader('include/rd_client.h', 'service/resource-directory', 'rd_client.h')