From a96dd736488520fd04f369473ee2ce8731134803 Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Thu, 26 May 2022 09:48:31 +0200
Subject: [PATCH] doc: add missing files and use full paths (#2822)

* doc: add missing files and use full paths

It seems that private_headers didn't work for out-of-tree builds.
This commit makes it use full paths and adds a few missing files.

* cplusplus: use the correct `install_dir` for the Doxygen docs
---
 cplusplus/meson.build |  2 +-
 doc/meson.build       | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/cplusplus/meson.build b/cplusplus/meson.build
index 07c1c674..34e53b12 100644
--- a/cplusplus/meson.build
+++ b/cplusplus/meson.build
@@ -59,6 +59,6 @@ if get_option('doxygen')
         output: 'html',
         command: [doxygen, doxyfile],
         install: true,
-        install_dir: get_option('prefix') / get_option('datadir') / 'doc' / 'libvips-doc'
+        install_dir: get_option('prefix') / get_option('datadir') / 'doc' / 'vips-doc'
     )
 endif
diff --git a/doc/meson.build b/doc/meson.build
index 4bdeaac2..197f4972 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,4 +1,4 @@
-private_headers = [
+private_libvips_headers = [
     'include/vips/almostdeprecated.h',
     'include/vips/deprecated.h',
     'include/vips/vips7compat.h',
@@ -34,7 +34,11 @@ private_headers = [
     'foreign/jpeg.h',
     'foreign/magick.h',
     'foreign/pforeign.h',
+    'foreign/quantise.h',
     'foreign/tiff.h',
+    'foreign/libnsgif/lzw.h',
+    'foreign/libnsgif/nsgif.h',
+    'foreign/libnsgif/test/cli.h',
     'freqfilt/pfreqfilt.h',
     'histogram/hist_unary.h',
     'histogram/phistogram.h',
@@ -47,6 +51,11 @@ private_headers = [
     'resample/templates.h'
 ]
 
+private_headers = []
+foreach private_libvips_header : private_libvips_headers
+    private_headers += [join_paths(meson.project_source_root(), 'libvips', private_libvips_header)]
+endforeach
+
 markdown_content_files = files(
     'How-it-works.md',
     'libvips-from-C++.md',
@@ -109,7 +118,10 @@ docpath = get_option('prefix') / get_option('datadir') / 'gtk-doc' / 'html'
 gnome.gtkdoc('libvips',
     mode: 'none',
     main_xml: 'libvips-docs.xml.in',
-    src_dir: include_directories('../libvips'),
+    src_dir: [
+        join_paths(meson.project_source_root(), 'libvips'),
+        join_paths(meson.project_build_root(), 'libvips'),
+    ],
     dependencies: libvips_dep,
     scan_args: [
       '--ignore-headers=' + ' '.join(private_headers),