From ffb34d248565c4682f29eedb414826add1970dfe Mon Sep 17 00:00:00 2001 From: Jan Vaclav Date: Tue, 21 Nov 2023 11:32:36 +0100 Subject: [PATCH] build/meson: fix gtkdoc dependencies This commit fixes the build process for the documentation that was previously unable to build separately via meson due to a dependency issue. Previously, trying to build the API documentation via `ninja NetworkManager-doc` failed due to missing dependencies (for example, `nm-dbus-types.xml` was not built). I believe this happens due to some different handling of static paths vs. custom_target by meson in this case. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1801 Fixes: 03637ad8b5d2 ('build: add initial support for meson build system') --- man/meson.build | 2 +- src/libnm-core-public/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man/meson.build b/man/meson.build index 7109937c9..f0113cd5d 100644 --- a/man/meson.build +++ b/man/meson.build @@ -120,7 +120,7 @@ if enable_introspection output: output, command: xsltproc_options + ['@INPUT@'], ) - content_files += input.full_path() + content_files += input output = '@0@.@1@'.format(man[0], man[1]) diff --git a/src/libnm-core-public/meson.build b/src/libnm-core-public/meson.build index d135dbff9..c684d084e 100644 --- a/src/libnm-core-public/meson.build +++ b/src/libnm-core-public/meson.build @@ -128,5 +128,5 @@ foreach docbook: docbooks build_by_default: true, ) - content_files += xml.full_path() + content_files += xml endforeach