[glib/wip/kalev/recursive-mutex-locker: 1/7] Meson: Fix declare_dependency() calls

[Kalev Lember <klember src gnome org>]

commit f933e49ceccd8866b862e439889bf7b6c4c99d5a
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Fri Dec 7 15:14:40 2018 -0500

    Meson: Fix declare_dependency() calls
    
    Turns out the fix in commit 93555577c wasn't enough, when using glib as
    subproject and the parent project uses only libgio_dep, and include
    <gi18n.h>, it won't find libintl.h because it's in the
    include_directories of libglib_dep. Fix that by declaring dependencies
    explicitly, which is the right thing to do since glib and gobject are
    public dependencies of gio. That reflects what we do for the pkg-config
    file as well.

 gio/meson.build     | 5 ++---
 gmodule/meson.build | 3 ++-
 gobject/meson.build | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/gio/meson.build b/gio/meson.build
index 272a4a708..47aa0b48d 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -855,9 +855,8 @@ else
 endif
 
 libgio_dep = declare_dependency(link_with : libgio,
-  dependencies : [gioenumtypes_dep],
-  # We sadly need to export configinc here because everyone includes <gio/*.h>
-  include_directories : [configinc, glibinc, gobjectinc, gmoduleinc, gioinc])
+  dependencies : [libgmodule_dep, libgobject_dep, gioenumtypes_dep],
+  include_directories : [gioinc])
 
 if host_system == 'windows'
   # Hack till https://github.com/mesonbuild/meson/issues/2324 is fixed
diff --git a/gmodule/meson.build b/gmodule/meson.build
index 8c95136b7..e4a6a1c81 100644
--- a/gmodule/meson.build
+++ b/gmodule/meson.build
@@ -141,4 +141,5 @@ pkg.generate(libraries : [libgmodule, export_dynamic_ldflags],
 )
 
 libgmodule_dep = declare_dependency(link_with : libgmodule,
-  include_directories : [configinc, gmoduleinc, glibinc])
+  include_directories : [gmoduleinc],
+  dependencies : [libglib_dep])
diff --git a/gobject/meson.build b/gobject/meson.build
index a9a8cff86..2ad903a40 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -84,7 +84,8 @@ pkg.generate(libgobject,
 )
 
 libgobject_dep = declare_dependency(link_with : libgobject,
-  include_directories : [configinc, glibinc, gobjectinc])
+  include_directories : [gobjectinc],
+  dependencies : [libglib_dep])
 
 python_tools = [
   'glib-genmarshal',