[gtk-doc/wip/tintou/cmake-content-files: 9/9] Merge branch 'master' into 'wip/tintou/cmake-content-files'

[Corentin Noël <corentinnoel src gnome org>]

commit f5560273c72011421ca3abb638fc56e28776288d
Merge: 244b219 b69c8f7
Author: Corentin Noël <corentin elementary io>
Date:   Tue Oct 23 11:26:33 2018 +0000

    Merge branch 'master' into 'wip/tintou/cmake-content-files'
    
    # Conflicts:
    #   buildsystems/cmake/GtkDocConfig.cmake

 buildsystems/autotools/Makefile.am          |  11 +-
 buildsystems/autotools/gtk-doc.no-xslt.make | 309 ++++++++++++++++++++++++++++
 buildsystems/autotools/gtkdocize.in         |   6 +
 buildsystems/cmake/GtkDocConfig.cmake       |   2 +-
 gtkdoc-mkhtml2.in                           |   3 +
 gtkdoc-scangobj.in                          |  10 +-
 gtkdoc/mkhtml2.py                           |  23 +--
 gtkdoc/scangobj.py                          |  14 +-
 tests/gobject/docs/meson.build              |  19 +-
 tests/helpers/gtkdoc_scangobj_runner.py     |  22 +-
 10 files changed, 385 insertions(+), 34 deletions(-)
---
diff --cc buildsystems/cmake/GtkDocConfig.cmake
index c8dab59,6f1ec4d..0206f5b
--- a/buildsystems/cmake/GtkDocConfig.cmake
+++ b/buildsystems/cmake/GtkDocConfig.cmake
@@@ -296,7 -253,7 +296,8 @@@ function(gtk_doc_add_module _doc_prefix
              ${_depends}
          ${_remove_xml_if_needed}
          COMMAND ${CMAKE_COMMAND} -E remove_directory ${_output_xml_dir}
+         ${_copy_xml_if_needed}
 +        ${_copy_content_files_if_needed}
          COMMAND ${GTKDOC_MKDB_EXE}
              --module=${_doc_prefix}
              ${_source_dirs_opt}