[gnome-calculator] GCalc: setup subproject variable for VAPI directory

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 0180701a238d989db52b44b42bd22842bf82d09b
Author: Daniel Espinosa <esodan gmail com>
Date:   Fri Jun 7 16:01:01 2019 -0500

    GCalc: setup subproject variable for VAPI directory

 gcalc/meson.build           |  2 +-
 meson.build                 | 11 +++--------
 search-provider/meson.build |  5 ++++-
 src/meson.build             |  2 ++
 4 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/gcalc/meson.build b/gcalc/meson.build
index 8ddc0935..66d1fb83 100644
--- a/gcalc/meson.build
+++ b/gcalc/meson.build
@@ -154,7 +154,7 @@ libgcalc = library(VERSIONED_PROJECT_NAME,
        vala_gir : GIR_NAME,
        dependencies : gcalc_deps,
        vala_args: [
-               '--vapidir='+vapi_dir,
+               '--vapidir='+gcalc_vapi_dir,
                '--pkg=mpc',
                '--pkg=mpfr'
        ],
diff --git a/meson.build b/meson.build
index 33db3332..a3793ebc 100644
--- a/meson.build
+++ b/meson.build
@@ -14,12 +14,7 @@ i18n = import('i18n')
 libexec_dir = join_paths(get_option('prefix'), get_option('libexecdir'))
 locale_dir = join_paths(get_option('prefix'), get_option('localedir'))
 po_dir = join_paths(meson.source_root(), 'po')
-vapi_dir = join_paths(meson.source_root(), 'vapi')
-
-# Add our custom VAPI dir
-add_project_arguments(['--vapidir', vapi_dir],
-  language: 'vala'
-)
+gcalc_vapi_dir = join_paths(meson.current_source_dir(), 'vapi')
 
 # Dependencies
 glib_min_version = '2.40.0'
@@ -50,13 +45,13 @@ libmath = cc.find_library('m')
 mpc = declare_dependency(
   dependencies: [
     cc.find_library('mpc'),
-    valac.find_library('mpc', dirs: vapi_dir)
+    valac.find_library('mpc', dirs: gcalc_vapi_dir)
   ]
 )
 mpfr = declare_dependency(
   dependencies: [
     cc.find_library('mpfr'),
-    valac.find_library('mpfr', dirs: vapi_dir)
+    valac.find_library('mpfr', dirs: gcalc_vapi_dir)
   ]
 )
 posix = valac.find_library('posix')
diff --git a/search-provider/meson.build b/search-provider/meson.build
index 58b5cead..fae9238e 100644
--- a/search-provider/meson.build
+++ b/search-provider/meson.build
@@ -34,7 +34,10 @@ executable('gnome-calculator-search-provider', search_provider_sources,
   link_with: [libcalculator, lib_mpfrg],
   install_dir: get_option('libexecdir'),
   include_directories: search_provider_includes,
-  vala_args: search_provider_vala_flags,
+  vala_args: [
+       search_provider_vala_flags,
+       '--vapidir='+gcalc_vapi_dir
+       ],
   c_args: search_provider_c_flags,
   install: true,
 )
diff --git a/src/meson.build b/src/meson.build
index 7172149b..eda7295a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -35,6 +35,7 @@ gnome_calculator_vala_flags = [
   '--vapidir=' + meson.current_source_dir(),
   '--pkg', 'config',
   '--gresources', gnome_calculator_resource_files,
+  '--vapidir='+gcalc_vapi_dir
 ]
 
 gnome_calculator_c_flags = [
@@ -76,6 +77,7 @@ gcalccmd_deps = [
 gcalccmd_vala_flags = [
   '--vapidir=' + meson.current_source_dir(),
   '--pkg', 'config',
+  '--vapidir='+gcalc_vapi_dir
 ]
 
 gcalccmd_includes = [