[devhelp] build: add gtk-doc fixxref_args for WebKitGTK+
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [devhelp] build: add gtk-doc fixxref_args for WebKitGTK+
- Date: Sun, 17 Jun 2018 13:10:20 +0000 (UTC)
commit 37d06220b863e61340175a5f619d3b0473446e11
Author: Sébastien Wilmet <swilmet gnome org>
Date: Sun Jun 17 14:40:03 2018 +0200
build: add gtk-doc fixxref_args for WebKitGTK+
I build Devhelp in jhbuild, the gtk-doc for glib, gtk etc are built and
installed in jhbuild (it's configured in my jhbuildrc), but I don't
build WebKitGTK+ in jhbuild. So before this commit there were
gtkdoc-fixxref warnings for the WebKit symbols. This commit fixes those
warnings.
docs/reference/meson.build | 12 +++++++++++-
meson.build | 3 ++-
2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index ea6b5f35..8bb5a69e 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -6,13 +6,23 @@ configure_file(
configuration : configuration_data() # TODO use "copy : true" when Meson 0.47 is released.
)
+gtkdoc_module_name = 'devhelp-@0@'.format(LIBDEVHELP_API_VERSION)
+html_dir = join_paths(get_option('prefix'), GNOME.gtkdoc_html_dir(gtkdoc_module_name))
+
+webkitgtk_dep = dependency(WEBKITGTK_DEP_STR)
+webkitgtk_prefix = webkitgtk_dep.get_pkgconfig_variable('prefix')
+
GNOME.gtkdoc(
- 'devhelp-@0@'.format(LIBDEVHELP_API_VERSION),
+ gtkdoc_module_name,
main_xml : 'devhelp-docs.xml',
src_dir : include_directories('../../devhelp/'),
dependencies : SHARED_LIBDEVHELP_DECLARED_DEP,
scan_args : ['--rebuild-types'],
gobject_typesfile : 'devhelp-@0@.types'.format(LIBDEVHELP_API_VERSION),
+ fixxref_args : [
+ '--html-dir=@0@'.format(html_dir),
+ '--extra-dir=@0@/share/gtk-doc/html/@1@'.format(webkitgtk_prefix, WEBKITGTK_DEP_STR)
+ ],
content_files : [
'api-breaks.xml'
],
diff --git a/meson.build b/meson.build
index ae861f55..1e6778c7 100644
--- a/meson.build
+++ b/meson.build
@@ -31,10 +31,11 @@ lt_revision=0
lt_age=0
LIBDEVHELP_LT_VERSION='@0@.@1@.@2@'.format(lt_current, lt_revision, lt_age)
+WEBKITGTK_DEP_STR = 'webkit2gtk-4.0'
libdevhelp_deps_array = [
['gio-2.0', '>= 2.56'],
['gtk+-3.0', '>= 3.22'],
- ['webkit2gtk-4.0', '>= 2.20']
+ [WEBKITGTK_DEP_STR, '>= 2.20']
]
LIBDEVHELP_DEPS_STR = []
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]