[gtk/docs-gtk-org] build: Consolidate common arguments



commit 5f0d78f63f3a7f89dc633d9bec07338a751e0e18
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Nov 12 16:58:25 2021 +0000

    build: Consolidate common arguments
    
    We don't need to repeat them all the time, so we can put them into the
    top level meson.build file.

 atk/atk/meson.build      | 3 +--
 atk/atspi2/meson.build   | 3 +--
 glib/gio/meson.build     | 3 +--
 glib/glib/meson.build    | 3 +--
 glib/gmodule/meson.build | 3 +--
 glib/gobject/meson.build | 3 +--
 gtk3/gdk/meson.build     | 6 ++----
 gtk3/gtk/meson.build     | 3 +--
 meson.build              | 5 +++++
 9 files changed, 14 insertions(+), 18 deletions(-)
---
diff --git a/atk/atk/meson.build b/atk/atk/meson.build
index 066a1a3a10..9f42dacd8f 100644
--- a/atk/atk/meson.build
+++ b/atk/atk/meson.build
@@ -10,10 +10,9 @@ custom_target('atk-doc',
   command: [
     gidocgen,
     'generate',
-    '--quiet',
+    gidocgen_common_args,
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
-    '--no-namespace-dir',
     '--content-dir=@0@'.format(meson.current_source_dir()),
     '@INPUT1@',
   ],
diff --git a/atk/atspi2/meson.build b/atk/atspi2/meson.build
index d4893db568..6988856acc 100644
--- a/atk/atspi2/meson.build
+++ b/atk/atspi2/meson.build
@@ -10,10 +10,9 @@ custom_target('atspi2-doc',
   command: [
     gidocgen,
     'generate',
-    '--quiet',
+    gidocgen_common_args,
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
-    '--no-namespace-dir',
     '--content-dir=@0@'.format(meson.current_source_dir()),
     '@INPUT1@',
   ],
diff --git a/glib/gio/meson.build b/glib/gio/meson.build
index ed22633f80..053276628d 100644
--- a/glib/gio/meson.build
+++ b/glib/gio/meson.build
@@ -10,10 +10,9 @@ custom_target('gio-doc',
   command: [
     gidocgen,
     'generate',
-    '--quiet',
+    gidocgen_common_args,
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
-    '--no-namespace-dir',
     '--content-dir=@0@'.format(meson.current_source_dir()),
     '--add-include-path=@0@'.format(meson.current_source_dir() / '../glib'),
     '--add-include-path=@0@'.format(meson.current_source_dir() / '../gobject'),
diff --git a/glib/glib/meson.build b/glib/glib/meson.build
index ffb3710499..89ea696246 100644
--- a/glib/glib/meson.build
+++ b/glib/glib/meson.build
@@ -23,10 +23,9 @@ custom_target('glib-doc',
   command: [
     gidocgen,
     'generate',
-    '--quiet',
+    gidocgen_common_args,
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
-    '--no-namespace-dir',
     '--content-dir=@0@'.format(meson.current_source_dir()),
     '@INPUT1@',
   ],
diff --git a/glib/gmodule/meson.build b/glib/gmodule/meson.build
index 52730d54c1..93a5e7319d 100644
--- a/glib/gmodule/meson.build
+++ b/glib/gmodule/meson.build
@@ -11,10 +11,9 @@ custom_target('gmodule-doc',
   command: [
     gidocgen,
     'generate',
-    '--quiet',
+    gidocgen_common_args,
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
-    '--no-namespace-dir',
     '--content-dir=@0@'.format(meson.current_source_dir()),
     '@INPUT1@',
   ],
diff --git a/glib/gobject/meson.build b/glib/gobject/meson.build
index caa9f41476..b1b488201e 100644
--- a/glib/gobject/meson.build
+++ b/glib/gobject/meson.build
@@ -16,10 +16,9 @@ custom_target('gobject-doc',
   command: [
     gidocgen,
     'generate',
-    '--quiet',
+    gidocgen_common_args,
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
-    '--no-namespace-dir',
     '--content-dir=@0@'.format(meson.current_source_dir()),
     '--add-include-path=@0@'.format(meson.current_source_dir() / '../glib'),
     '@INPUT1@',
diff --git a/gtk3/gdk/meson.build b/gtk3/gdk/meson.build
index f899086410..1bbcea4b3c 100644
--- a/gtk3/gdk/meson.build
+++ b/gtk3/gdk/meson.build
@@ -10,10 +10,9 @@ custom_target('gdk3-doc',
   command: [
     gidocgen,
     'generate',
-    '--quiet',
+    gidocgen_common_args,
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
-    '--no-namespace-dir',
     '--content-dir=@0@'.format(meson.current_source_dir()),
     '--add-include-path=@0@'.format(meson.current_source_dir()),
     '@INPUT1@',
@@ -31,10 +30,9 @@ custom_target('gdk3-x11-doc',
   command: [
     gidocgen,
     'generate',
-    '--quiet',
+    gidocgen_common_args,
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
-    '--no-namespace-dir',
     '--content-dir=@0@'.format(meson.current_source_dir()),
     '--add-include-path=@0@'.format(meson.current_source_dir()),
     '@INPUT1@',
diff --git a/gtk3/gtk/meson.build b/gtk3/gtk/meson.build
index ba9c0ae7de..dc4186b4ff 100644
--- a/gtk3/gtk/meson.build
+++ b/gtk3/gtk/meson.build
@@ -32,10 +32,9 @@ custom_target('gtk3-doc',
   command: [
     gidocgen,
     'generate',
-    '--quiet',
+    gidocgen_common_args,
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
-    '--no-namespace-dir',
     '--content-dir=@0@'.format(meson.current_source_dir()),
     '--add-include-path=@0@'.format(meson.current_source_dir() / '../gdk'),
     '--add-include-path=@0@'.format(meson.current_source_dir() / '../../atk'),
diff --git a/meson.build b/meson.build
index ebb6f520f6..c59d78ae53 100644
--- a/meson.build
+++ b/meson.build
@@ -16,6 +16,11 @@ toml_conf.set('VERSION', meson.project_version())
 
 gidocgen = find_program('gi-docgen', required: true)
 
+gidocgen_common_args = [
+  '--quiet',
+  '--no-namespace-dir',
+]
+
 subdir('glib/glib')
 subdir('glib/gmodule')
 subdir('glib/gobject')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]