resource-directory: Fix libs dependencies and order

Problem was observed when building on yocto

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: I1246cd5bb83738a14fa0aa9e68cf35c4fbc8cbac
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/17651
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

diff --git a/resource/csdk/resource-directory/unittests/SConscript b/resource/csdk/resource-directory/unittests/SConscript
index 3cc6ad1..06c6093 100644 (file)
--- a/resource/csdk/resource-directory/unittests/SConscript
+++ b/resource/csdk/resource-directory/unittests/SConscript
@@ -68,12 +68,14 @@ rd_test_env.AppendUnique(
 
 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 = ['resource_directory', 'octbstack' ])
+rd_test_env.PrependUnique(LIBS = ['octbstack'])
 
 if rd_test_env.get('RD_MODE'):
     rd_mode = rd_test_env.get('RD_MODE')
+    rd_test_env.PrependUnique(LIBS = ['resource_directory'])
     if 'CLIENT' in rd_mode:
         rd_test_env.AppendUnique(CPPDEFINES = ['RD_CLIENT'])
+        rd_test_env.AppendUnique(LIBS = ['oc', 'oc_logger'])
     if 'SERVER' in rd_mode:
         rd_test_env.AppendUnique(CPPDEFINES = ['RD_SERVER'])