meson: Follow gnome conventions for build option names

10 files changed, 37 insertions, 37 deletions

diff --git a/.gitlab-ci/test-docker-meson.sh b/.gitlab-ci/test-docker-meson.sh
index 4603c5e0bf..c791f3f1ba 100755
--- a/.gitlab-ci/test-docker-meson.sh
+++ b/.gitlab-ci/test-docker-meson.sh
@@ -10,11 +10,11 @@ export PATH="${HOME}/.local/bin:${PATH}"
 python3 -m pip install --user meson==0.49.2
 
 meson \
-    -Ddocumentation=true \
-    -Dman-pages=true \
-    -Dbroadway-backend=true \
+    -Dgtk_doc=true \
+    -Dman=true \
+    -Dbroadway_backend=true \
     -Dxinerama=yes \
-    -Dprint-backends="file,lpr,test,cloudprint,cups" \
+    -Dprint_backends="file,lpr,test,cloudprint,cups" \
     _build
 
 cd _build
diff --git a/.gitlab-ci/test-msys2-meson.sh b/.gitlab-ci/test-msys2-meson.sh
index 23351a2b53..6116411dd5 100644
--- a/.gitlab-ci/test-msys2-meson.sh
+++ b/.gitlab-ci/test-msys2-meson.sh
@@ -40,8 +40,8 @@ ccache --zero-stats
 ccache --show-stats
 
 meson \
-    -Dman-pages=true \
-    -Dbroadway-backend=true \
+    -Dman=true \
+    -Dbroadway_backend=true \
     _build
 
 ninja -C _build
diff --git a/docs/reference/gdk/meson.build b/docs/reference/gdk/meson.build
index 007770f3aa..96a993e066 100644
--- a/docs/reference/gdk/meson.build
+++ b/docs/reference/gdk/meson.build
@@ -154,7 +154,7 @@ if wayland_enabled
   src_dir += [ gdkwayland_inc ]
 endif
 
-if get_option('documentation')
+if get_option('gtk_doc')
 
     configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
 
diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
index 892e272301..a49235cb1e 100644
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -445,7 +445,7 @@ else
   types_conf.set('ENABLE_ON_X11', '%')
 endif
 
-if get_option('documentation')
+if get_option('gtk_doc')
 
     configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
     configure_file(input: 'getting_started.xml.in', output: 'getting_started.xml', configuration: src_dir_conf)
@@ -485,11 +485,11 @@ if get_option('documentation')
 endif
 
 xsltproc = find_program('xsltproc', required: false)
-if get_option('man-pages') and not xsltproc.found()
+if get_option('man') and not xsltproc.found()
   error('No xsltproc found, but man pages were explicitly enabled')
 endif
 
-if get_option('man-pages') and xsltproc.found()
+if get_option('man') and xsltproc.found()
   xlstproc_flags = [
     '--nonet',
     '--stringparam', 'man.output.quietly', '1',
diff --git a/docs/reference/libgail-util/meson.build b/docs/reference/libgail-util/meson.build
index 870c3c2482..ce32d9f8db 100644
--- a/docs/reference/libgail-util/meson.build
+++ b/docs/reference/libgail-util/meson.build
@@ -1,4 +1,4 @@
-if get_option('documentation')
+if get_option('gtk_doc')
     configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
 
     gnome.gtkdoc('gail-libgail-util3',
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index daec53a847..2e28fba4a8 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -1,4 +1,4 @@
-if get_option('documentation')
+if get_option('gtk_doc')
     glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
     glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
 
diff --git a/docs/tools/meson.build b/docs/tools/meson.build
index 5de632f141..05621ee7ed 100644
--- a/docs/tools/meson.build
+++ b/docs/tools/meson.build
@@ -1,4 +1,4 @@
-if x11_enabled and get_option('documentation')
+if x11_enabled
   doc_shooter_sources = [
     'shadow.c',
     'shooter.c',
diff --git a/meson.build b/meson.build
index b6a9ddd062..3411e3a046 100644
--- a/meson.build
+++ b/meson.build
@@ -112,11 +112,11 @@ gtk_osxversions = [(100 * gtk_minor_version) + 1, '@0@.@1@.0'.format((100 * gtk_
 
 gtk_api_version = '@0@.0'.format(gtk_major_version)
 
-x11_enabled            = get_option('x11-backend')
-wayland_enabled        = get_option('wayland-backend')
-broadway_enabled       = get_option('broadway-backend')
-quartz_enabled         = get_option('quartz-backend')
-win32_enabled          = get_option('win32-backend')
+x11_enabled            = get_option('x11_backend')
+wayland_enabled        = get_option('wayland_backend')
+broadway_enabled       = get_option('broadway_backend')
+quartz_enabled         = get_option('quartz_backend')
+win32_enabled          = get_option('win32_backend')
 
 os_unix   = false
 os_linux  = false
@@ -824,11 +824,11 @@ subdir('libgail-util')
 if get_option('demos')
   subdir('demos')
 endif
-if get_option('build-tests')
+if get_option('tests')
   subdir('tests')
   subdir('testsuite')
 endif
-if get_option('build-examples')
+if get_option('examples')
   subdir('examples')
 endif
 
@@ -975,11 +975,11 @@ summary = [
   '     Cloud support: @0@'.format(get_option('cloudproviders')),
   '    Colord support: @0@'.format(get_option('colord')),
   '     Introspection: @0@'.format(get_option('introspection')),
-  '     Documentation: @0@'.format(get_option('documentation')),
-  '         Man pages: @0@'.format(get_option('man-pages')),
-  '       Build tests: @0@'.format(get_option('build-tests')),
+  '     Documentation: @0@'.format(get_option('gtk_doc')),
+  '         Man pages: @0@'.format(get_option('man')),
+  '       Build tests: @0@'.format(get_option('tests')),
   '             Demos: @0@'.format(get_option('demos')),
-  '          Examples: @0@'.format(get_option('build-examples')),
+  '          Examples: @0@'.format(get_option('examples')),
   'Directories:',
   '            prefix: @0@'.format(gtk_prefix),
   '        includedir: @0@'.format(gtk_includedir),
diff --git a/meson_options.txt b/meson_options.txt
index 21ca1ca2c8..7a0e7aa592 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,13 +1,13 @@
 # GDK backends
-option('x11-backend', type: 'boolean', value: true,
+option('x11_backend', type: 'boolean', value: true,
   description : 'Enable the X11 gdk backend (only when building on Unix)')
-option('wayland-backend', type: 'boolean', value: true,
+option('wayland_backend', type: 'boolean', value: true,
   description : 'Enable the wayland gdk backend (only when building on Unix except for macOS)')
-option('broadway-backend', type: 'boolean', value: false,
+option('broadway_backend', type: 'boolean', value: false,
   description : 'Enable the broadway (HTML5) gdk backend')
-option('win32-backend', type: 'boolean', value: true,
+option('win32_backend', type: 'boolean', value: true,
   description : 'Enable the Windows gdk backend (only when building on Windows)')
-option('quartz-backend', type: 'boolean', value: true,
+option('quartz_backend', type: 'boolean', value: true,
   description : 'Enable the macOS gdk backend (only when building on macOS)')
 
 # Optional dependencies
@@ -17,15 +17,15 @@ option('cloudproviders', type: 'boolean', value: false,
   description : 'Enable the cloudproviders support')
 
 # Print backends
-option('print-backends', type : 'string', value : 'auto',
+option('print_backends', type : 'string', value : 'auto',
   description : 'Build the specified print backends (comma-separated list, any of "cloudprint,cups,file,lpr,papi,test" or "auto")')
 option('colord', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto',
   description : 'Build colord support for the CUPS printing backend')
 
 # Documentation and introspection
-option('documentation', type: 'boolean', value: 'false',
-  description : 'Build API reference and tools documentation')
-option('man-pages', type: 'boolean', value: 'false',
+option('gtk_doc', type: 'boolean', value: 'false',
+  description : 'Build API reference with gtk-doc')
+option('man', type: 'boolean', value: 'false',
   description : 'Build man pages for installed tools')
 option('introspection', type: 'boolean', value: 'true',
   description : 'Build introspection data (requires gobject-introspection)')
@@ -33,9 +33,9 @@ option('introspection', type: 'boolean', value: 'true',
 # Demos and binaries
 option('demos', type: 'boolean', value: 'true',
   description : 'Build demo programs')
-option('build-examples', type: 'boolean', value: 'true',
+option('examples', type: 'boolean', value: 'true',
   description : 'Build examples')
-option('build-tests', type: 'boolean', value: 'true',
+option('tests', type: 'boolean', value: 'true',
   description : 'Build tests')
 
 # input modules
diff --git a/modules/printbackends/meson.build b/modules/printbackends/meson.build
index 36f322b487..3f4dfd13f1 100644
--- a/modules/printbackends/meson.build
+++ b/modules/printbackends/meson.build
@@ -17,11 +17,11 @@ foreach backend: all_print_backends
 endforeach
 
 print_strict_deps = true
-if get_option('print-backends') == 'auto'
+if get_option('print_backends') == 'auto'
   enabled_print_backends = auto_print_backends
   print_strict_deps = false
 else
-  wanted_print_backends = get_option('print-backends').split(',')
+  wanted_print_backends = get_option('print_backends').split(',')
   enabled_print_backends = []
   foreach backend: wanted_print_backends
     if backend != ''