[folks/wip/nielsdg/meson-followup-fixes: 3/3] meson: Don't use hardcoded dependency names



commit 7fd81d0c305928f06add56b5658a55bbf0eaa860
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Thu Apr 18 00:09:02 2019 +0200

    meson: Don't use hardcoded dependency names
    
    Use the name() method from the dependency objects themselves, which is
    more foolproof in case of an update and makes sure we don't refer to
    dependencies we shouldn't be using.

 backends/eds/lib/meson.build          | 2 +-
 backends/libsocialweb/lib/meson.build | 2 +-
 backends/telepathy/lib/meson.build    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/backends/eds/lib/meson.build b/backends/eds/lib/meson.build
index 8371324c..dbc75a6d 100644
--- a/backends/eds/lib/meson.build
+++ b/backends/eds/lib/meson.build
@@ -27,7 +27,7 @@ eds_backendlib_deps = [
 # doesn't have native support (https://github.com/mesonbuild/meson/issues/894)
 eds_backendlib_doc_deps = [
   '--pkg', 'folks',
-  '--pkg', 'libebook-1.2',
+  '--pkg', libebook_dep.name(),
 ]
 
 eds_backendlib_vala_flags = [
diff --git a/backends/libsocialweb/lib/meson.build b/backends/libsocialweb/lib/meson.build
index 7eec724a..39632f23 100644
--- a/backends/libsocialweb/lib/meson.build
+++ b/backends/libsocialweb/lib/meson.build
@@ -23,8 +23,8 @@ libsocialweb_backendlib_deps = [
 # FIXME: we need to set these manually for the valadoc target as long as meson
 # doesn't have native support (https://github.com/mesonbuild/meson/issues/894)
 libsocialweb_backendlib_doc_deps = [
-  '--pkg', 'libsocialweb-client',
   '--pkg', 'folks',
+  '--pkg', libsocialweb_dep.name(),
 ]
 
 libsocialweb_backendlib_vala_flags = [
diff --git a/backends/telepathy/lib/meson.build b/backends/telepathy/lib/meson.build
index 8f68d8d7..2a191ca6 100644
--- a/backends/telepathy/lib/meson.build
+++ b/backends/telepathy/lib/meson.build
@@ -95,7 +95,7 @@ telepathy_backendlib_deps = [
 telepathy_backendlib_doc_deps = [
   '--pkg', 'folks',
   '--pkg', 'tp-lowlevel', '--vapidir', meson.current_build_dir(),
-  '--pkg', 'telepathy-glib',
+  '--pkg', telepathy_glib_dep.name(),
 ]
 
 if zeitgeist_enabled


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]