[gtk/ebassi/gidocgen] docs: Use "no-namespace-dir" option for gi-docgen

[Emmanuele Bassi <ebassi src gnome org>]

commit 985afd9d0fe7f7e726b4ebf3f0bcdd79d7d5eeac
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Feb 12 00:18:45 2021 +0000

    docs: Use "no-namespace-dir" option for gi-docgen
    
    We are already using namespaced output directories, there's no need to
    add more complexity.

 docs/reference/gdk/meson.build | 11 +++++++----
 docs/reference/gsk/meson.build |  3 ++-
 docs/reference/gtk/meson.build |  3 ++-
 3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/docs/reference/gdk/meson.build b/docs/reference/gdk/meson.build
index 62c9591c55..c296084d5e 100644
--- a/docs/reference/gdk/meson.build
+++ b/docs/reference/gdk/meson.build
@@ -45,13 +45,14 @@ expand_content_md_files = [
 if get_option('gtk_doc')
   custom_target('gdk4-doc',
     input: gdk_gir[0],
-    output: 'html',
+    output: 'gdk4',
     command: [
       gidocgen,
       'generate',
       '--add-include-path=@0@'.format(meson.current_source_dir() / '../../../gtk'),
       '--config=@0@'.format(meson.current_source_dir() / 'gdk.toml'),
       '--output-dir=@OUTPUT@',
+      '--no-namespace-dir',
       '--content-dir=@0@'.format(meson.current_source_dir()),
       '@INPUT@',
     ],
@@ -62,13 +63,14 @@ if get_option('gtk_doc')
   if x11_enabled
     custom_target('gdk4-x11-doc',
       input: gdk_x11_gir[0],
-      output: 'html',
+      output: 'gdk4-x11',
       command: [
         gidocgen,
         'generate',
         '--add-include-path=@0@'.format(meson.current_source_dir() / '../../../gtk'),
         '--config=@0@'.format(meson.current_source_dir() / 'gdk.toml'),
         '--output-dir=@OUTPUT@',
+        '--no-namespace-dir',
         '--content-dir=@0@'.format(meson.current_source_dir()),
         '@INPUT@',
       ],
@@ -78,15 +80,16 @@ if get_option('gtk_doc')
   endif
 
   if wayland_enabled
-    custom_target('gdk4-x11-doc',
+    custom_target('gdk4-wayland-doc',
       input: gdk_wayland_gir[0],
-      output: 'html',
+      output: 'gdk4-wayland',
       command: [
         gidocgen,
         'generate',
         '--add-include-path=@0@'.format(meson.current_source_dir() / '../../../gtk'),
         '--config=@0@'.format(meson.current_source_dir() / 'gdk.toml'),
         '--output-dir=@OUTPUT@',
+        '--no-namespace-dir',
         '--content-dir=@0@'.format(meson.current_source_dir()),
         '@INPUT@',
       ],
diff --git a/docs/reference/gsk/meson.build b/docs/reference/gsk/meson.build
index 9845c092af..5a1e81409b 100644
--- a/docs/reference/gsk/meson.build
+++ b/docs/reference/gsk/meson.build
@@ -1,13 +1,14 @@
 if get_option('gtk_doc')
   custom_target('gsk4-doc',
     input: gsk_gir[0],
-    output: 'html',
+    output: 'gsk4',
     command: [
       gidocgen,
       'generate',
       '--add-include-path=@0@'.format(meson.current_source_dir() / '../../../gtk'),
       '--config=@0@'.format(meson.current_source_dir() / 'gsk.toml'),
       '--output-dir=@OUTPUT@',
+      '--no-namespace-dir',
       '--content-dir=@0@'.format(meson.current_source_dir()),
       '@INPUT@',
     ],
diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
index f9e3f85142..e055da63a6 100644
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -27,13 +27,14 @@ expand_content_md_files = [
 if get_option('gtk_doc')
   custom_target('gtk4-doc',
     input: gtk_gir[0],
-    output: 'html',
+    output: 'gtk4',
     command: [
       gidocgen,
       'generate',
       '--add-include-path=@0@'.format(meson.current_source_dir() / '../../../gtk'),
       '--config=@0@'.format(meson.current_source_dir() / 'gtk.toml'),
       '--output-dir=@OUTPUT@',
+      '--no-namespace-dir',
       '--content-dir=@0@'.format(meson.current_source_dir()),
       '@INPUT@',
     ],