[libsoup/meson-deps: 2/2] meson: cleanup targets dependencies

[Tomas Popela <tpopela src gnome org>]

commit f426de737a6d8815098940d3bf839bb7aaa575e8
Author: Claudio Saavedra <csaavedra igalia com>
Date:   Fri Mar 15 15:17:46 2019 +0200

    meson: cleanup targets dependencies
    
    This fixes issues when adding new symbols and building with
    introspection enabled. Additionally, the workaround for
    tests seems to be unneeded.

 libsoup/meson.build | 6 +++---
 tests/meson.build   | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/libsoup/meson.build b/libsoup/meson.build
index 92b615f4..bfef032d 100644
--- a/libsoup/meson.build
+++ b/libsoup/meson.build
@@ -290,6 +290,7 @@ if enable_introspection or enable_vapi
       soup_enum_h,
       soup_version_h
     ],
+    dependencies : libsoup_dep,
     nsversion : apiversion,
     namespace : soup_ns,
     symbol_prefix : soup_ns.to_lower(),
@@ -301,9 +302,8 @@ if enable_introspection or enable_vapi
     header: join_paths(meson.project_name(), 'soup.h'),
   )
 
-  soup_gir_gen_dep = declare_dependency(link_with : libsoup,
-    include_directories : configinc,
-    dependencies : deps,
+  soup_gir_gen_dep = declare_dependency(
+    dependencies : libsoup_dep,
     sources : soup_gir_gen_sources)
 
   if enable_vapi
diff --git a/tests/meson.build b/tests/meson.build
index 1f0ff7cf..2882c27a 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -96,8 +96,6 @@ endif
 env = environment()
 env.set('G_TEST_SRCDIR', meson.current_source_dir())
 env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-# See https://github.com/mesonbuild/meson/issues/4228 for the workaround below
-env.prepend('LD_LIBRARY_PATH', meson.build_root() + '/libsoup')
 env.set('G_DEBUG', 'gc-friendly')
 env.set('MALLOC_CHECK_', '2')
 # This is set by Meson if empty
@@ -108,7 +106,7 @@ foreach test: tests
   test_target = executable(test_name,
     sources : [ test_name + '.c', test_resources ],
     link_with : test_utils,
-    dependencies : [glib_dep, libsoup_dep, platform_deps])
+    dependencies : libsoup_dep)
   # Increase the timeout as on some architectures the tests could be slower
   # than the default 30 seconds.
   test(test_name, test_target, env : env, is_parallel : test[1], timeout : 60)