From abbdf57d2c0e8a93f8c99d958d41c36e62139589 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Wed, 22 Mar 2017 15:53:21 +0100 Subject: [PATCH] resource: Use global LIBPATH for samples As set in shared file: resource/c_common/SConscript Bug: https://jira.iotivity.org/browse/IOT-1745 Change-Id: I4defd1996ed17c8e0701f48ebe54b4de0310442c Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/18093 Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai --- resource/c_common/ocrandom/test/SConscript | 1 - resource/csdk/resource-directory/samples/SConscript | 1 - resource/csdk/security/SConscript | 1 - resource/csdk/security/provisioning/sample/SConscript | 1 - .../csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript | 1 - resource/csdk/stack/samples/linux/SimpleClientServer/SConscript | 1 - resource/csdk/stack/samples/linux/secure/SConscript | 1 - resource/examples/SConscript | 1 - resource/provisioning/unittests/SConscript | 1 - 9 files changed, 9 deletions(-) diff --git a/resource/c_common/ocrandom/test/SConscript b/resource/c_common/ocrandom/test/SConscript index f9a0703..7ce000c 100644 --- a/resource/c_common/ocrandom/test/SConscript +++ b/resource/c_common/ocrandom/test/SConscript @@ -38,7 +38,6 @@ randomtest_env.PrependUnique(CPPPATH = [ '../../../oc_logger/include', ]) -randomtest_env.AppendUnique(LIBPATH = [randomtest_env.get('BUILD_DIR')]) randomtest_env.PrependUnique(LIBS = ['octbstack', 'connectivity_abstraction', 'uuid']) diff --git a/resource/csdk/resource-directory/samples/SConscript b/resource/csdk/resource-directory/samples/SConscript index 1b0ce46..8eba260 100644 --- a/resource/csdk/resource-directory/samples/SConscript +++ b/resource/csdk/resource-directory/samples/SConscript @@ -44,7 +44,6 @@ rd_sample_app_env.AppendUnique(CPPPATH = ['../include', if target_os not in ['windows']: rd_sample_app_env.AppendUnique(CXXFLAGS = ['-O2', '-g', '-Wall', '-Wextra', '-std=c++0x']) -rd_sample_app_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) rd_sample_app_env.AppendUnique(RPATH = [env.get('BUILD_DIR')]) rd_sample_app_env.PrependUnique(LIBS = ['resource_directory', 'octbstack']) diff --git a/resource/csdk/security/SConscript b/resource/csdk/security/SConscript index 45372e4..2c3b2c5 100644 --- a/resource/csdk/security/SConscript +++ b/resource/csdk/security/SConscript @@ -77,7 +77,6 @@ if target_os not in ['arduino', 'windows']: libocsrm_env.AppendUnique(CPPDEFINES = ['WITH_POSIX', '_GNU_SOURCE']) libocsrm_env.AppendUnique(CFLAGS = ['-std=c99', '-Wall']) -libocsrm_env.AppendUnique(LIBPATH = [libocsrm_env.get('BUILD_DIR')]) libocsrm_env.AppendUnique(LIBS = ['coap']) if target_os == 'arduino': diff --git a/resource/csdk/security/provisioning/sample/SConscript b/resource/csdk/security/provisioning/sample/SConscript index b8eb2cb..96c570c 100644 --- a/resource/csdk/security/provisioning/sample/SConscript +++ b/resource/csdk/security/provisioning/sample/SConscript @@ -45,7 +45,6 @@ if target_os not in ['windows']: if target_os not in ['msys_nt', 'windows']: provisioning_sample_env.AppendUnique(LIBS = ['dl', 'm']) - provisioning_sample_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')]) else: provisioning_sample_env.AppendUnique(LIBPATH = [os.path.join(env.get('BUILD_DIR'), 'resource', 'csdk')]) diff --git a/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript b/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript index a733b86..d8d2781 100644 --- a/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript +++ b/resource/csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript @@ -33,7 +33,6 @@ arduino_simplecs_env.PrependUnique(CPPPATH = [ '../../../../../../oc_logger/include' ]) -arduino_simplecs_env.AppendUnique(LIBPATH = [arduino_simplecs_env.get('BUILD_DIR')]) arduino_simplecs_env.AppendUnique(CPPDEFINES = ['TB_LOG']) arduino_simplecs_env.PrependUnique(LIBS = ['octbstack', 'ocsrm', 'connectivity_abstraction','coap', 'timer']) diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript index ac02a55..5a145b7 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/SConscript @@ -53,7 +53,6 @@ if 'g++' in compiler: samples_env.AppendUnique(CXXFLAGS=['-std=c++0x', '-Wall']) samples_env.AppendUnique(RPATH=[samples_env.get('BUILD_DIR')]) -samples_env.AppendUnique(LIBPATH=[samples_env.get('BUILD_DIR')]) samples_env.PrependUnique( LIBS=['octbstack', 'ocsrm', 'connectivity_abstraction', 'coap']) diff --git a/resource/csdk/stack/samples/linux/secure/SConscript b/resource/csdk/stack/samples/linux/secure/SConscript index b1f8815..2085ffe 100644 --- a/resource/csdk/stack/samples/linux/secure/SConscript +++ b/resource/csdk/stack/samples/linux/secure/SConscript @@ -41,7 +41,6 @@ if target_os not in ['windows']: samples_env.AppendUnique(LIBS = ['pthread']) samples_env.Append(LINKFLAGS = ['-Wl,--no-as-needed']) -samples_env.AppendUnique(LIBPATH = [samples_env.get('BUILD_DIR')]) if target_os in ['windows', 'msys_nt']: samples_env.PrependUnique(LIBS = ['ocsrm', 'ws2_32', 'iphlpapi']) else: diff --git a/resource/examples/SConscript b/resource/examples/SConscript index 01bcea3..0cfb61c 100644 --- a/resource/examples/SConscript +++ b/resource/examples/SConscript @@ -44,7 +44,6 @@ examples_env.AppendUnique(CPPPATH = [ '#/resource/oc_logger/include' ]) -examples_env.AppendUnique(LIBPATH = [examples_env.get('BUILD_DIR')]) examples_env.AppendUnique(RPATH = [examples_env.get('BUILD_DIR')]) examples_env.PrependUnique(LIBS = ['coap']) examples_env.AppendUnique(LIBS = ['connectivity_abstraction']) diff --git a/resource/provisioning/unittests/SConscript b/resource/provisioning/unittests/SConscript index 9a3f1b9..6a9dde5 100755 --- a/resource/provisioning/unittests/SConscript +++ b/resource/provisioning/unittests/SConscript @@ -56,7 +56,6 @@ provisiontests_env.PrependUnique(CPPPATH = [ '../../../extlibs/hippomocks-master/HippoMocksTest' ]) -provisiontests_env.AppendUnique(LIBPATH = [provisiontests_env.get('BUILD_DIR')]) provisiontests_env.PrependUnique(LIBS = [ 'ocprovision', 'oc', -- 2.7.4