diff options
| -rw-r--r-- | doc/c/Doxyfile.in | 10 | ||||
| -rw-r--r-- | doc/c/meson.build | 12 | ||||
| -rw-r--r-- | doc/c/xml/meson.build | 2 | ||||
| -rw-r--r-- | doc/cpp/Doxyfile.in | 11 | ||||
| -rw-r--r-- | doc/cpp/api/meson.build | 2 | ||||
| -rw-r--r-- | doc/cpp/meson.build | 12 | ||||
| -rw-r--r-- | doc/cpp/xml/meson.build | 2 |
7 files changed, 34 insertions, 17 deletions
diff --git a/doc/c/Doxyfile.in b/doc/c/Doxyfile.in index 96bbf63..d119015 100644 --- a/doc/c/Doxyfile.in +++ b/doc/c/Doxyfile.in @@ -20,9 +20,13 @@ XML_PROGRAMLISTING = NO SHOW_FILES = NO MACRO_EXPANSION = YES -PREDEFINED = PUGL_API PUGL_DISABLE_DEPRECATED PUGL_CONST_API= PUGL_CONST_FUNC= +PREDEFINED = PUGL_API \ + PUGL_DISABLE_DEPRECATED \ + PUGL_CONST_API= \ + PUGL_CONST_FUNC= +RECURSIVE = YES STRIP_FROM_PATH = @PUGL_SRCDIR@ -INPUT = @PUGL_HEADERS@ +INPUT = @PUGL_SRCDIR@/include -OUTPUT_DIRECTORY = doc/c +OUTPUT_DIRECTORY = @DOX_OUTPUT@ diff --git a/doc/c/meson.build b/doc/c/meson.build index df9363e..65302b3 100644 --- a/doc/c/meson.build +++ b/doc/c/meson.build @@ -26,8 +26,10 @@ subdir('xml') subdir('api') docs = custom_target( - 'C API Documentation (singlehtml)', - command: [sphinx_build, '-M', 'singlehtml', 'doc/c/', 'doc/c/', '-E', '-q', '-t', 'singlehtml'], + 'singlehtml C documentation for pugl', + command: [sphinx_build, '-M', 'singlehtml', + meson.current_build_dir(), meson.current_build_dir(), + '-E', '-q', '-t', 'singlehtml'], input: [c_rst_files, c_pugl_rst, c_index_xml], output: 'singlehtml', build_by_default: true, @@ -35,8 +37,10 @@ docs = custom_target( install_dir: docdir / 'pugl-0') docs = custom_target( - 'C API Documentation (html)', - command: [sphinx_build, '-M', 'html', 'doc/c/', 'doc/c/', '-E', '-q', '-t', 'html'], + 'html C documentation for pugl', + command: [sphinx_build, '-M', 'html', + meson.current_build_dir(), meson.current_build_dir(), + '-E', '-q', '-t', 'html'], input: [c_rst_files, c_pugl_rst, c_index_xml], output: 'html', build_by_default: true, diff --git a/doc/c/xml/meson.build b/doc/c/xml/meson.build index d79d59a..ea5df9c 100644 --- a/doc/c/xml/meson.build +++ b/doc/c/xml/meson.build @@ -6,8 +6,8 @@ foreach h : c_headers endforeach config = configuration_data() -config.set('PUGL_HEADERS', ' '.join(c_doxygen_input)) config.set('PUGL_SRCDIR', pugl_src_root) +config.set('DOX_OUTPUT', meson.current_build_dir() / '..') c_doxyfile = configure_file(configuration: config, input: '../Doxyfile.in', diff --git a/doc/cpp/Doxyfile.in b/doc/cpp/Doxyfile.in index 889ac0b..5e1be1c 100644 --- a/doc/cpp/Doxyfile.in +++ b/doc/cpp/Doxyfile.in @@ -24,9 +24,14 @@ XML_PROGRAMLISTING = NO SHOW_FILES = NO MACRO_EXPANSION = YES -PREDEFINED = PUGL_API PUGL_DISABLE_DEPRECATED PUGL_CONST_API= PUGL_CONST_FUNC= +PREDEFINED = PUGL_API \ + PUGL_DISABLE_DEPRECATED \ + PUGL_CONST_API= \ + PUGL_CONST_FUNC= +RECURSIVE = YES STRIP_FROM_PATH = @PUGL_SRCDIR@ -INPUT = @PUGL_HEADERS@ +INPUT = @PUGL_SRCDIR@/include \ + @PUGL_SRCDIR@/bindings/cpp/include -OUTPUT_DIRECTORY = doc/cpp +OUTPUT_DIRECTORY = @DOX_OUTPUT@ diff --git a/doc/cpp/api/meson.build b/doc/cpp/api/meson.build index 4bbbec2..4e5bae5 100644 --- a/doc/cpp/api/meson.build +++ b/doc/cpp/api/meson.build @@ -1,5 +1,5 @@ cpp_pugl_rst = custom_target( 'C++ API ReST Documentation', - command: [dox_to_sphinx, '-l', 'cpp', '-f', '@INPUT@', 'doc/cpp/api'], + command: [dox_to_sphinx, '-l', 'cpp', '-f', '@INPUT@', meson.current_build_dir()], input: cpp_index_xml, output: 'pugl.rst') diff --git a/doc/cpp/meson.build b/doc/cpp/meson.build index ad25319..358a042 100644 --- a/doc/cpp/meson.build +++ b/doc/cpp/meson.build @@ -25,8 +25,10 @@ subdir('xml') subdir('api') docs = custom_target( - 'C++ API Documentation (singlehtml)', - command: [sphinx_build, '-M', 'singlehtml', 'doc/cpp/', 'doc/cpp/', '-E', '-q', '-t', 'singlehtml'], + 'singlehtml C++ documentation for pugl', + command: [sphinx_build, '-M', 'singlehtml', + meson.current_build_dir(), meson.current_build_dir(), + '-E', '-q', '-t', 'singlehtml'], input: [cpp_rst_files, cpp_pugl_rst, cpp_index_xml], output: 'singlehtml', build_by_default: true, @@ -34,8 +36,10 @@ docs = custom_target( install_dir: docdir / 'puglpp-0') docs = custom_target( - 'C++ API Documentation (html)', - command: [sphinx_build, '-M', 'html', 'doc/cpp/', 'doc/cpp/', '-E', '-q', '-t', 'html'], + 'html C++ documentation for pugl', + command: [sphinx_build, '-M', 'html', + meson.current_build_dir(), meson.current_build_dir(), + '-E', '-q', '-t', 'html'], input: [cpp_rst_files, cpp_pugl_rst, cpp_index_xml], output: 'html', build_by_default: true, diff --git a/doc/cpp/xml/meson.build b/doc/cpp/xml/meson.build index 3f87f2a..d23a563 100644 --- a/doc/cpp/xml/meson.build +++ b/doc/cpp/xml/meson.build @@ -6,8 +6,8 @@ foreach h : c_headers + cpp_headers endforeach config = configuration_data() -config.set('PUGL_HEADERS', ' '.join(cpp_doxygen_input)) config.set('PUGL_SRCDIR', pugl_src_root) +config.set('DOX_OUTPUT', meson.current_build_dir() / '..') cpp_doxyfile = configure_file(configuration: config, input: '../Doxyfile.in', |