From 751c1877b11dfb7baacacdf4ef73acd35c0ccd13 Mon Sep 17 00:00:00 2001 From: Ting-Wei Lan Date: Fri, 15 Jun 2018 23:51:15 +0800 Subject: [PATCH] docs: Fix gtk-doc build when wayland is disabled Unconditionally putting 'gdkwayland_inc' in src_dir argument of gtkdoc call tells gtkdoc-scan to scan source files in a non-existent build directory, gdk/wayland. To avoid causing build failure when a specific backend is disabled, we should include directories conditionally. --- docs/reference/gdk/meson.build | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/reference/gdk/meson.build b/docs/reference/gdk/meson.build index 72bcfc55cf..57f93a9637 100644 --- a/docs/reference/gdk/meson.build +++ b/docs/reference/gdk/meson.build @@ -87,16 +87,22 @@ images = [ 'images/zoom_out_cursor.png', ] +src_dir = [ gdkinc ] + +if x11_enabled + src_dir += [ gdkx11_inc ] +endif + +if wayland_enabled + src_dir += [ gdkwayland_inc ] +endif + configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf) gnome.gtkdoc('gdk4', mode: 'none', main_xml: 'gdk4-docs.xml', - src_dir: [ - gdkinc, - gdkx11_inc, - gdkwayland_inc, - ], + src_dir: src_dir, dependencies: libgtk_dep, gobject_typesfile: join_paths(meson.current_source_dir(), 'gdk4.types'), scan_args: [ -- 2.30.2