[gnome-calculator] GCalc: improve use of as meson subproject

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 773201586c2ed085e8260b35abdb86adcb396b90
Author: Daniel Espinosa <esodan gmail com>
Date:   Wed Oct 23 12:30:18 2019 -0500

    GCalc: improve use of as meson subproject
    
    Namespaced library dependencies and avoid to add namespace-info deps
    to avoid conflicts to other libraries using this as subproject

 gcalc/meson.build           | 26 +++++++++++++++-----------
 gci/meson.build             | 12 ++++++++----
 lib/meson.build             |  2 +-
 search-provider/meson.build |  2 +-
 src/meson.build             |  4 ++--
 tests/meson.build           |  2 +-
 6 files changed, 28 insertions(+), 20 deletions(-)
---
diff --git a/gcalc/meson.build b/gcalc/meson.build
index 1bb573c9..a786db86 100644
--- a/gcalc/meson.build
+++ b/gcalc/meson.build
@@ -27,10 +27,10 @@ configure_file(input : 'gcalc.deps.in',
        install : true,
        install_dir : vapidir)
 
-nsinfo = configure_file(input : 'namespace-info.vala.in',
+gcalc_nsinfo = configure_file(input : 'namespace-info.vala.in',
        output : 'namespace-info.vala',
        configuration : conf)
-namespaceinfo_dep = declare_dependency (sources : nsinfo)
+gcalc_namespaceinfo_dep = declare_dependency (sources : gcalc_nsinfo)
 
 confh = configuration_data ()
 confh.set_quoted('PACKAGE_LOCALE_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'locale'))
@@ -119,22 +119,26 @@ gcalc_sources = files([
 ])
 
 
-inc_libh = include_directories ('.')
-inc_libh_dep = declare_dependency (include_directories : inc_libh)
+gcalc_inc_libh = include_directories ('.')
+gcalc_inc_libh_dep = declare_dependency (include_directories : gcalc_inc_libh)
 gcalc_build_dir = meson.current_build_dir ()
 gcalc_sources_dir = meson.current_source_dir ()
 
-gcalc_deps = [
+gcalc_exported_deps = [
        gio,
-       namespaceinfo_dep,
-       inc_libh_dep,
-       inc_rooth_dep,
        posix,
        libxml,
        libsoup,
        libmath,
-       gee
+       gee,
+       inc_rooth_dep,
+       gcalc_inc_libh_dep,
+]
+
+gcalc_deps = [
+       gcalc_namespaceinfo_dep,
 ]
+gcalc_deps += gcalc_exported_deps
 
 # LT_VERSION for ABI related changes
 # From: https://autotools.io/libtool/version.html
@@ -192,7 +196,7 @@ custom_target('gcalc-typelib',
 endif
 endif
 
-libgcalc_dep = declare_dependency(include_directories : inc_libh,
+libgcalc_dep = declare_dependency(include_directories : gcalc_inc_libh,
   link_with : libgcalc,
-  dependencies: gcalc_deps,
+  dependencies: gcalc_exported_deps,
   )
diff --git a/gci/meson.build b/gci/meson.build
index f20b431e..5b270d53 100644
--- a/gci/meson.build
+++ b/gci/meson.build
@@ -48,15 +48,19 @@ gci_inc_libh_dep = declare_dependency (include_directories : gci_inc_libh)
 gci_build_dir = meson.current_build_dir ()
 gci_sources_dir = meson.current_source_dir ()
 
-gci_deps = [
+gci_exported_deps = [
        gio,
-       gci_namespaceinfo_dep,
-       inc_libh_dep,
+       gcalc_inc_libh_dep,
        inc_rooth_dep,
        gci_inc_libh_dep,
        gee,
        gtk
 ]
+gci_deps = [
+       gci_namespaceinfo_dep,
+]
+
+gci_deps += gci_exported_deps
 
 # LT_VERSION for ABI related changes
 # From: https://autotools.io/libtool/version.html
@@ -112,5 +116,5 @@ endif
 
 libgci_dep = declare_dependency(include_directories : gci_inc_libh,
   link_with : libgci,
-  dependencies: gci_deps,
+  dependencies: gci_exported_deps,
   )
diff --git a/lib/meson.build b/lib/meson.build
index 7cc854f6..bc4239bd 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -32,7 +32,7 @@ libcalculator_deps = [
   mpc,
   mpfr,
   posix,
-  inc_libh_dep
+  gcalc_inc_libh_dep
 ]
 
 libcalculator = static_library('calculator', libcalculator_sources,
diff --git a/search-provider/meson.build b/search-provider/meson.build
index fae9238e..52bf5fc0 100644
--- a/search-provider/meson.build
+++ b/search-provider/meson.build
@@ -11,7 +11,7 @@ search_provider_deps = [
   mpc,
   mpfr,
   posix,
-  inc_libh_dep
+  gcalc_inc_libh_dep
 ]
 
 search_provider_vala_flags = [
diff --git a/src/meson.build b/src/meson.build
index eda7295a..824feaa4 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -27,7 +27,7 @@ gnome_calculator_deps = [
   mpc,
   mpfr,
   posix,
-  inc_libh_dep
+  gcalc_inc_libh_dep
 ]
 
 gnome_calculator_vala_flags = [
@@ -71,7 +71,7 @@ gcalccmd_deps = [
   mpc,
   mpfr,
   posix,
-  inc_libh_dep
+  gcalc_inc_libh_dep
 ]
 
 gcalccmd_vala_flags = [
diff --git a/tests/meson.build b/tests/meson.build
index ccca485a..e76a591a 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -55,7 +55,7 @@ gci_test_deps = [
        gee,
        gtk,
        inc_rooth_dep,
-       inc_libh_dep,
+       gcalc_inc_libh_dep,
        gci_inc_libh_dep
 ]