doc/api: fix the doxygen output handling
authorPeter Hutterer <peter.hutterer@who-t.net>
Tue, 29 Sep 2020 07:33:36 +0000 (17:33 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Tue, 29 Sep 2020 07:48:31 +0000 (17:48 +1000)
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 <peter.hutterer@who-t.net>
doc/api/libinput.doxygen.in
doc/api/meson.build

index a006daeb7647bc7df2f19aefefd309815261313c..9f6cfa25b672ac79436d704e3d4677381d35ff91 100644 (file)
@@ -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
index b5018e65b6ade92224e90f362248df4982b9bccc..f7b246e4a85633f9262a5825a40c33419261a3a1 100644 (file)
@@ -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 ],