[Spice-devel] [PATCH spice-gtk] fixup: Add support for building with meson/ninja

Eduardo Lima (Etrunko) etrunko at redhat.com
Tue Aug 14 13:00:46 UTC 2018


Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
---
 src/meson.build | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/meson.build b/src/meson.build
index c9429f5..b9ee039 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -301,21 +301,18 @@ if spice_gtk_has_gtk
              'osx',
              'win32',
              'x11']
-  spice_gtk_keymaps = []
 
   foreach keymap : keymaps
     varname = 'keymap_ at 0@2xtkbd'.format(keymap)
     target = 'vncdisplay at 0@.h'.format(varname)
     cmd = [python, keymapgen, '--lang', 'glib2', '--varname', varname, 'code-map', keymapcsv, keymap, 'xtkbd']
-    spice_gtk_keymaps += custom_target(target,
-                                       output : target,
-                                       capture : true,
-                                       build_by_default: true,
-                                       command : cmd)
+    spice_client_gtk_sources += custom_target(target,
+                                              output : target,
+                                              capture : true,
+                                              build_by_default: true,
+                                              command : cmd)
   endforeach
 
-  spice_gtk_keymaps_dep = declare_dependency(sources : spice_gtk_keymaps)
-
   #
   # libspice-client-gtk.so
   #
@@ -331,7 +328,7 @@ if spice_gtk_has_gtk
                                  install : true,
                                  link_args : spice_gtk_link_args + [spice_gtk_version_script],
                                  link_depends : spice_client_gtk_syms,
-                                 dependencies : [spice_client_glib_dep, spice_gtk_keymaps_dep])
+                                 dependencies : spice_client_glib_dep)
 
   spice_client_gtk_dep = declare_dependency(sources : spice_widget_enums[1],
                                             link_with : spice_client_gtk_lib,
-- 
2.14.4



More information about the Spice-devel mailing list