From 788c7179a47686be4e5a2362655c73d6d433945e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 29 Sep 2020 17:33:36 +1000 Subject: [PATCH] doc/api: fix the doxygen output handling Using output: ['.'] broke ninja after ninja clean - it removed the whole directory and thus the meson-generated configure_files (i.e. all the doxygen sources we copied). ninja didn't know how to build those. Fix this by rearranging the doxygen output to build into a different directory now and setting the output to that. This doesn't exactly *fix* things since that directory is no longer removed during ninja clean, but at least the build no longer fails. Signed-off-by: Peter Hutterer --- doc/api/libinput.doxygen.in | 3 ++- doc/api/meson.build | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/api/libinput.doxygen.in b/doc/api/libinput.doxygen.in index a006daeb..9f6cfa25 100644 --- a/doc/api/libinput.doxygen.in +++ b/doc/api/libinput.doxygen.in @@ -11,8 +11,9 @@ WARNINGS = YES QUIET = YES INPUT = "@builddir@" IMAGE_PATH = "@builddir@" +OUTPUT_DIRECTORY = doc GENERATE_HTML = YES -HTML_OUTPUT = api +HTML_OUTPUT = html SEARCHENGINE = NO USE_MATHJAX = YES MATHJAX_RELPATH = https://cdn.mathjax.org/mathjax/latest diff --git a/doc/api/meson.build b/doc/api/meson.build index b5018e65..f7b246e4 100644 --- a/doc/api/meson.build +++ b/doc/api/meson.build @@ -45,7 +45,7 @@ doxyfile = configure_file(input : 'libinput.doxygen.in', custom_target('doxygen', input : [ doxyfiles, doxyfile, mainpage ] + src_doxygen, - output : [ '.' ], + output : [ 'html' ], command : [ doxygen, doxyfile ], install : false, depends: [ mainpage ],