vala: Fix shared_module linking with export_dynamic executable

Need to generate a vapi and a header, and then use that in the shared
module. Needed for GNOME games.

Closes https://github.com/mesonbuild/meson/issues/3538

2 files changed, 4 insertions, 2 deletions

diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index ff28525..c508cec 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -1058,6 +1058,8 @@ int dummy;
         """
         result = OrderedSet()
         for dep in itertools.chain(target.link_targets, target.link_whole_targets):
+            if not dep.is_linkable_target():
+                continue
             for i in dep.sources:
                 if hasattr(i, 'fname'):
                     i = i.fname
@@ -1180,7 +1182,7 @@ int dummy;
         # found inside the build tree (generated sources).
         args += ['--directory', c_out_dir]
         args += ['--basedir', srcbasedir]
-        if not isinstance(target, build.Executable):
+        if target.is_linkable_target():
             # Library name
             args += ['--library', target.name]
             # Outputted header
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 1750661..362a6de 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -698,7 +698,7 @@ just like those detected with the dependency() function.''')
         for key, value in compiler_args.items():
             self.add_compiler_args(key, value)
 
-        if not isinstance(self, Executable):
+        if not isinstance(self, Executable) or 'export_dynamic' in kwargs:
             self.vala_header = kwargs.get('vala_header', self.name + '.h')
             self.vala_vapi = kwargs.get('vala_vapi', self.name + '.vapi')
             self.vala_gir = kwargs.get('vala_gir', None)