From: Philippe Coval Date: Fri, 10 Mar 2017 16:53:14 +0000 (+0100) Subject: resource: Use global LIBPATH X-Git-Tag: 1.3.0~455 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b36faba1ba95ecce1b73a3539013cdf7d01b7918;p=platform%2Fupstream%2Fiotivity.git resource: Use global LIBPATH As set in shared file: resource/c_common/SConscript Bug: https://jira.iotivity.org/browse/IOT-1745 Change-Id: Id5fce812c8da866305647308919bced90397cc5d Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/17829 Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai Reviewed-by: Ashok Babu Channa --- diff --git a/resource/c_common/SConscript b/resource/c_common/SConscript index 98ce6b2..ac5e002 100644 --- a/resource/c_common/SConscript +++ b/resource/c_common/SConscript @@ -143,9 +143,7 @@ env.AppendUnique(CPPPATH = [ os.path.join(Dir('.').abspath, 'octhread', 'include') ]) -if target_os == 'tizen': - env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) -else: +if target_os not in ['tizen']: env.AppendUnique(LIBPATH = [os.path.join(env.get('BUILD_DIR'), 'resource', 'c_common')]) if target_os in ['tizen', 'linux']: diff --git a/resource/csdk/connectivity/build/android/SConscript b/resource/csdk/connectivity/build/android/SConscript index 6fef07c..0405243 100644 --- a/resource/csdk/connectivity/build/android/SConscript +++ b/resource/csdk/connectivity/build/android/SConscript @@ -169,7 +169,6 @@ if env.get('LOGGING'): env.AppendUnique(CPPDEFINES = ['WITH_POSIX', '__ANDROID__']) env.AppendUnique(CCFLAGS = ['-Wall', '-fPIC']) -env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) src_dir = env.get('SRC_DIR') env.AppendUnique(LIBPATH = [src_dir + '/lib/android']) env.AppendUnique(LIBS = ['log', 'coap']) diff --git a/resource/csdk/connectivity/test/SConscript b/resource/csdk/connectivity/test/SConscript index 6a0c1f8..c876721 100644 --- a/resource/csdk/connectivity/test/SConscript +++ b/resource/csdk/connectivity/test/SConscript @@ -52,7 +52,6 @@ catest_env.PrependUnique(CPPPATH = [ '#/resource/oc_logger/include', ]) -catest_env.AppendUnique(LIBPATH = [catest_env.get('BUILD_DIR')]) catest_env.PrependUnique(LIBS = ['octbstack_test', 'connectivity_abstraction', 'coap']) diff --git a/resource/csdk/resource-directory/SConscript b/resource/csdk/resource-directory/SConscript index 123d147..c8c75aa 100755 --- a/resource/csdk/resource-directory/SConscript +++ b/resource/csdk/resource-directory/SConscript @@ -52,7 +52,6 @@ if 'CLIENT' in rd_mode: if 'SERVER' in rd_mode: rd_env.AppendUnique(CPPDEFINES = ['RD_SERVER']) -rd_env.PrependUnique(LIBPATH = [rd_env.get('BUILD_DIR')]) if target_os != 'android': rd_env.PrependUnique(RPATH = [rd_env.get('BUILD_DIR')]) rd_env.PrependUnique(LIBS = ['octbstack', 'oc', 'oc_logger']) diff --git a/resource/csdk/resource-directory/unittests/SConscript b/resource/csdk/resource-directory/unittests/SConscript index 06c6093..560fa5c 100644 --- a/resource/csdk/resource-directory/unittests/SConscript +++ b/resource/csdk/resource-directory/unittests/SConscript @@ -66,7 +66,6 @@ rd_test_env.AppendUnique( src_dir + '/resource/csdk/stack/test/', src_dir + '/resource/oc_logger/include',]) -rd_test_env.AppendUnique(LIBPATH = [lib_env.get('BUILD_DIR')]) rd_test_env.AppendUnique(RPATH = [lib_env.get('BUILD_DIR')]) rd_test_env.PrependUnique(LIBS = ['octbstack']) diff --git a/resource/csdk/routing/SConscript b/resource/csdk/routing/SConscript index d02dd3f..95aac37 100644 --- a/resource/csdk/routing/SConscript +++ b/resource/csdk/routing/SConscript @@ -3,9 +3,7 @@ import os env.AppendUnique(CPPPATH = [os.path.join(Dir('.').abspath, './include')]) -if env.get('TARGET_OS') == 'tizen': - env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) -else: +if env.get('TARGET_OS') not in ['tizen']: env.AppendUnique(LIBPATH = [os.path.join(env.get('BUILD_DIR'), 'resource/csdk/routing/')]) env.AppendUnique(LIBS = ['routingmanager']) diff --git a/resource/csdk/security/provisioning/SConscript b/resource/csdk/security/provisioning/SConscript index eeca319..8f4ec10 100644 --- a/resource/csdk/security/provisioning/SConscript +++ b/resource/csdk/security/provisioning/SConscript @@ -45,7 +45,6 @@ provisioning_env.AppendUnique(CPPDEFINES= ['__WITH_DTLS__']) if 'g++' in provisioning_env.get('CXX'): provisioning_env.AppendUnique(CXXFLAGS = ['-std=c++0x']) -provisioning_env.AppendUnique(LIBPATH = [provisioning_env.get('BUILD_DIR')]) provisioning_env.PrependUnique(LIBS = ['octbstack', 'oc_logger', 'connectivity_abstraction', 'coap']) if target_os not in ['msys_nt', 'windows']: diff --git a/resource/csdk/security/provisioning/unittest/SConscript b/resource/csdk/security/provisioning/unittest/SConscript index e803772..dc957e9 100644 --- a/resource/csdk/security/provisioning/unittest/SConscript +++ b/resource/csdk/security/provisioning/unittest/SConscript @@ -60,7 +60,6 @@ sptest_env.PrependUnique(CPPPATH = [ '../../../connectivity/common/inc', '../../../connectivity/api' ]) -sptest_env.AppendUnique(LIBPATH = [sptest_env.get('BUILD_DIR')]) sptest_env.PrependUnique(LIBS = [ 'ocpmapi', 'oc', 'octbstack_test', diff --git a/resource/csdk/security/tool/SConscript b/resource/csdk/security/tool/SConscript index d0a47e6..a44202b 100644 --- a/resource/csdk/security/tool/SConscript +++ b/resource/csdk/security/tool/SConscript @@ -48,7 +48,6 @@ tools_env.PrependUnique(CPPPATH = ['#/extlibs/cjson', '../include/internal' ]) tools_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-Wextra', '-std=c++0x']) -tools_env.AppendUnique(LIBPATH = [tools_env.get('BUILD_DIR')]) tools_env.AppendUnique(RPATH = [tools_env.get('BUILD_DIR')]) SConscript('#/extlibs/cjson/SConscript') diff --git a/resource/csdk/security/unittest/SConscript b/resource/csdk/security/unittest/SConscript index 4110243..7b8071c 100644 --- a/resource/csdk/security/unittest/SConscript +++ b/resource/csdk/security/unittest/SConscript @@ -57,7 +57,6 @@ srmtest_env.PrependUnique(CPPPATH = [ '../include' ]) -srmtest_env.AppendUnique(LIBPATH = [srmtest_env.get('BUILD_DIR')]) srmtest_env.PrependUnique(LIBS = ['ocsrm', 'octbstack_test', 'oc_logger', diff --git a/resource/csdk/stack/SConscript b/resource/csdk/stack/SConscript index 76527ed..ece16ab 100644 --- a/resource/csdk/stack/SConscript +++ b/resource/csdk/stack/SConscript @@ -92,8 +92,6 @@ elif liboctbstack_env.get('ROUTING') == 'EP': if target_os not in ['windows']: liboctbstack_env.AppendUnique(CFLAGS = ['-Wall']) -liboctbstack_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) - liboctbstack_env.PrependUnique(LIBS = ['ocsrm', 'coap', 'timer']) if target_os in ['linux'] and liboctbstack_env.get('SIMULATOR', False): @@ -145,7 +143,6 @@ elif target_os not in ['darwin','ios', 'msys_nt', 'windows']: if target_os in ['darwin', 'ios']: env.AppendUnique(CPPDEFINES = ['_DARWIN_C_SOURCE']) liboctbstack_env.AppendUnique(CPPDEFINES = ['_DARWIN_C_SOURCE']) - liboctbstack_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) if target_os not in ['arduino', 'windows']: liboctbstack_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined']) if target_os == 'android': diff --git a/resource/csdk/stack/test/SConscript b/resource/csdk/stack/test/SConscript index c87eade..f294f41 100644 --- a/resource/csdk/stack/test/SConscript +++ b/resource/csdk/stack/test/SConscript @@ -46,7 +46,6 @@ stacktest_env.PrependUnique(CPPPATH = [ '../../../oc_logger/include', ]) -stacktest_env.AppendUnique(LIBPATH = [stacktest_env.get('BUILD_DIR')]) stacktest_env.PrependUnique(LIBS = ['octbstack_test', 'ocsrm', 'connectivity_abstraction', diff --git a/resource/oc_logger/examples/SConscript b/resource/oc_logger/examples/SConscript index e5a5eea..f1dd133 100644 --- a/resource/oc_logger/examples/SConscript +++ b/resource/oc_logger/examples/SConscript @@ -32,7 +32,6 @@ examples_env = lib_env.Clone() # Build flags ###################################################################### examples_env.PrependUnique(CPPPATH = ['../include']) -examples_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) examples_env.AppendUnique(LIBS = ['oc_logger']) examples_env.Append(LIBS = ['c_common']) diff --git a/resource/src/SConscript b/resource/src/SConscript index 77b7d34..27c8d27 100644 --- a/resource/src/SConscript +++ b/resource/src/SConscript @@ -58,8 +58,6 @@ oclib_env.AppendUnique(CPPPATH = [ '../csdk/connectivity/api' ]) -oclib_env.AppendUnique(LIBPATH = [oclib_env.get('BUILD_DIR')]) - oclib_env.AppendUnique(LIBS = ['oc_logger']) oclib_env.PrependUnique(LIBS = ['octbstack', 'connectivity_abstraction', 'ocsrm']) diff --git a/resource/unittests/SConscript b/resource/unittests/SConscript index c804f8e..02f880d 100644 --- a/resource/unittests/SConscript +++ b/resource/unittests/SConscript @@ -56,7 +56,6 @@ if target_os in ['windows']: # On other platforms, octbstack_test is a shared LIB, that includes static LIB ocsrm. unittests_env.AppendUnique(LIBS = ['ocsrm']) -unittests_env.AppendUnique(LIBPATH = [unittests_env.get('BUILD_DIR')]) unittests_env.PrependUnique(LIBS = [ 'oc', 'octbstack_test',