[Spice-commits] 2 commits - doc/reference meson.build src/meson.build
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Sep 4 20:43:42 UTC 2018
doc/reference/meson.build | 5 ++---
meson.build | 1 -
src/meson.build | 23 +++++++----------------
3 files changed, 9 insertions(+), 20 deletions(-)
New commits:
commit 66f73a7c3cee5a74953931b9bed7afd4705eb505
Author: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Date: Mon Sep 3 15:37:51 2018 -0300
meson: Drop calls to declare_dependency() where appropriate
No need to use it when we can actually specify the parameters in the
actual gnome.generate_gir() function calls. We still keep it in the case
of gnome.gtkdoc(), as there is no way to specify the libraries to link
with.
Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Acked-by: Frediano Ziglio <fziglio at redhat.com>
diff --git a/doc/reference/meson.build b/doc/reference/meson.build
index 2ec333b..7cb94f3 100644
--- a/doc/reference/meson.build
+++ b/doc/reference/meson.build
@@ -36,8 +36,7 @@ ignore_headers = [
'win-usb-dev.h',
]
-spice_gtk_doc_dep = declare_dependency(include_directories: spice_gtk_include,
- link_with : [spice_client_gtk_lib, spice_client_glib_lib])
+spice_gtk_doc_dep = declare_dependency(link_with : [spice_client_gtk_lib, spice_client_glib_lib])
gnome.gtkdoc('spice-gtk',
content_files : ['spice-gtk-overrides.txt', 'spice-gtk-overrides.txt'],
@@ -45,6 +44,7 @@ gnome.gtkdoc('spice-gtk',
main_xml : 'spice-gtk-docs.xml',
gobject_typesfile : files('spice-gtk.types'),
ignore_headers : ignore_headers,
+ include_directories: spice_gtk_include,
install : true,
scan_args : ['--deprecated-guards="SPICE_DISABLE_DEPRECATED"', '--ignore-decorators="G_GNUC_INTERNAL"'],
src_dir : join_paths(meson.source_root(), 'src'))
diff --git a/src/meson.build b/src/meson.build
index c777546..8c9199e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -206,17 +206,15 @@ spice_client_glib_dep = declare_dependency(sources : [spice_marshals[1], spice_c
#
# SpiceClientGLib-2.0.gir
#
-spice_client_glib_introspection_dep = declare_dependency(include_directories: spice_gtk_include,
- link_with : spice_client_glib_lib)
-
spice_client_glib_gir = gnome.generate_gir(spice_client_glib_lib,
build_by_default : spice_gtk_has_introspection,
- dependencies : spice_client_glib_introspection_dep,
export_packages : 'spice-client-glib-2.0',
extra_args : ['--accept-unprefixed'],
header : 'spice-client.h',
includes : ['GObject-2.0', 'Gio-2.0'],
identifier_prefix : 'Spice',
+ include_directories: spice_gtk_include,
+ link_with : spice_client_glib_lib,
symbol_prefix : 'spice',
install : spice_gtk_has_introspection,
namespace : 'SpiceClientGLib',
@@ -355,16 +353,14 @@ if spice_gtk_has_gtk
#
# SpiceClientGtk-3.0.gir
#
- spice_client_gtk_introspection_dep = declare_dependency(include_directories : spice_gtk_include,
- link_with : [spice_client_gtk_lib, spice_client_glib_lib])
-
spice_client_gtk_gir = gnome.generate_gir(spice_client_gtk_lib,
build_by_default : spice_gtk_has_introspection,
- dependencies : spice_client_gtk_introspection_dep,
export_packages : 'spice-client-gtk-3.0',
extra_args : ['--accept-unprefixed'],
header : 'spice-widget.h',
includes : ['GObject-2.0', 'Gtk-3.0', spice_client_glib_gir[0]],
+ include_directories: spice_gtk_include,
+ link_with : spice_client_glib_lib,
identifier_prefix : 'Spice',
symbol_prefix : 'spice',
install : spice_gtk_has_introspection,
commit d1cef504dee2764369f6c64683237ae1a0bd9602
Author: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Date: Mon Sep 3 15:37:50 2018 -0300
meson: Remove unecessary spice_gtk_link_args variable
Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
Acked-by: Frediano Ziglio <fziglio at redhat.com>
diff --git a/doc/reference/meson.build b/doc/reference/meson.build
index 7ac703f..2ec333b 100644
--- a/doc/reference/meson.build
+++ b/doc/reference/meson.build
@@ -37,7 +37,6 @@ ignore_headers = [
]
spice_gtk_doc_dep = declare_dependency(include_directories: spice_gtk_include,
- link_args : spice_gtk_link_args,
link_with : [spice_client_gtk_lib, spice_client_glib_lib])
gnome.gtkdoc('spice-gtk',
diff --git a/meson.build b/meson.build
index 98d0413..3c20401 100644
--- a/meson.build
+++ b/meson.build
@@ -42,7 +42,6 @@ spice_protocol_min_version='0.12.13'
spice_gtk_include = [include_directories('.')]
spice_gtk_libs = []
spice_gtk_deps = []
-spice_gtk_link_args = []
spice_gtk_host_system = host_machine.system()
#
diff --git a/src/meson.build b/src/meson.build
index b2188af..c777546 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -167,8 +167,6 @@ endif
# libspice-client-glib-2.0.so
#
-# custom link_args
-
# version-script
spice_client_glib_syms = files('map-file')
spice_client_glib_syms_path = join_paths(meson.current_source_dir(), 'map-file')
@@ -195,7 +193,7 @@ spice_client_glib_lib = library('spice-client-glib-2.0', spice_client_glib_sourc
version : spice_client_glib_so_version,
install : true,
include_directories : spice_gtk_include,
- link_args : spice_gtk_link_args + [spice_gtk_version_script],
+ link_args : [spice_gtk_version_script],
link_depends : spice_client_glib_syms,
link_with : spice_gtk_libs,
dependencies : spice_gtk_deps)
@@ -203,14 +201,12 @@ spice_client_glib_lib = library('spice-client-glib-2.0', spice_client_glib_sourc
spice_client_glib_dep = declare_dependency(sources : [spice_marshals[1], spice_client_glib_enums[1]],
link_with : spice_client_glib_lib,
include_directories : spice_gtk_include,
- link_args : spice_gtk_link_args,
dependencies : spice_gtk_deps)
#
# SpiceClientGLib-2.0.gir
#
spice_client_glib_introspection_dep = declare_dependency(include_directories: spice_gtk_include,
- link_args : spice_gtk_link_args,
link_with : spice_client_glib_lib)
spice_client_glib_gir = gnome.generate_gir(spice_client_glib_lib,
@@ -232,7 +228,7 @@ spice_client_glib_gir = gnome.generate_gir(spice_client_glib_lib,
#
if spice_gtk_has_polkit
usb_acl_helper_c_args = []
- usb_acl_helper_link_args = spice_gtk_link_args
+ usb_acl_helper_link_args = []
if spice_gtk_has_pie
usb_acl_helper_c_args += compiler.get_supported_arguments(['-fPIE'])
@@ -348,7 +344,7 @@ if spice_gtk_has_gtk
spice_client_gtk_lib = library('spice-client-gtk-3.0', spice_client_gtk_sources,
version : spice_client_gtk_so_version,
install : true,
- link_args : spice_gtk_link_args + [spice_gtk_version_script],
+ link_args : [spice_gtk_version_script],
link_depends : spice_client_gtk_syms,
dependencies : spice_client_glib_dep)
@@ -360,7 +356,6 @@ if spice_gtk_has_gtk
# SpiceClientGtk-3.0.gir
#
spice_client_gtk_introspection_dep = declare_dependency(include_directories : spice_gtk_include,
- link_args : spice_gtk_link_args,
link_with : [spice_client_gtk_lib, spice_client_glib_lib])
spice_client_gtk_gir = gnome.generate_gir(spice_client_gtk_lib,
More information about the Spice-commits
mailing list