[totem] build: Fix dependency on gir file for Vala plugins



commit d44f52542b091b5350677721d040092b46e546d3
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Jun 23 20:18:41 2017 +0200

    build: Fix dependency on gir file for Vala plugins

 src/plugins/meson.build              |    6 +++++-
 src/plugins/rotation/meson.build     |    2 +-
 src/plugins/sample-vala/meson.build  |    2 +-
 src/plugins/zeitgeist-dp/meson.build |    2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/src/plugins/meson.build b/src/plugins/meson.build
index 99c7163..9836c95 100644
--- a/src/plugins/meson.build
+++ b/src/plugins/meson.build
@@ -114,7 +114,9 @@ if plugins_option != 'none'
   endif
 
   if have_vala
-    plugins_vala_sources = [libtotem_gir[0]]
+    plugins_vala_deps = [
+      declare_dependency(sources: libtotem_gir)
+    ]
 
     plugins_vala_flags = [
       '-Wno-unused-but-set-variable',
@@ -127,6 +129,8 @@ if plugins_option != 'none'
       '--pkg=Totem-1.0',
     ]
 
+    plugins_vala_sources = []
+
     plugins += [
       'rotation',
       'sample-vala'
diff --git a/src/plugins/rotation/meson.build b/src/plugins/rotation/meson.build
index b55d3c4..438b9f9 100644
--- a/src/plugins/rotation/meson.build
+++ b/src/plugins/rotation/meson.build
@@ -21,7 +21,7 @@ shared_module(
     backend_inc,
     src_inc
   ],
-  dependencies: plugin_deps,
+  dependencies: plugin_deps + plugins_vala_deps,
   c_args: plugins_cflags + plugins_vala_flags + [
     '--include=config.h'
   ],
diff --git a/src/plugins/sample-vala/meson.build b/src/plugins/sample-vala/meson.build
index 7c9c02c..45cbb79 100644
--- a/src/plugins/sample-vala/meson.build
+++ b/src/plugins/sample-vala/meson.build
@@ -15,7 +15,7 @@ shared_module(
     'totem-' + plugin_name + '-plugin.vala'
   ],
   include_directories: plugins_incs,
-  dependencies: plugin_deps,
+  dependencies: plugin_deps + plugins_vala_deps,
   c_args: plugins_cflags + plugins_vala_flags,
   vala_args: plugins_vala_args,
   install: plugin_install,
diff --git a/src/plugins/zeitgeist-dp/meson.build b/src/plugins/zeitgeist-dp/meson.build
index ff328f6..059d742 100644
--- a/src/plugins/zeitgeist-dp/meson.build
+++ b/src/plugins/zeitgeist-dp/meson.build
@@ -21,7 +21,7 @@ shared_module(
     backend_inc,
     src_inc
   ],
-  dependencies: plugin_deps,
+  dependencies: plugin_deps + plugins_vala_deps,
   c_args: plugins_cflags + plugins_vala_flags + [
     '--include=config.h'
   ],


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