Refresh the build

Use a consistent, idiomatic syntax and coding style for the Meson build.

2 files changed, 26 insertions, 31 deletions

diff --git a/docs/meson.build b/docs/meson.build
index fb26d40..d6b9c8a 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -5,37 +5,28 @@ private_headers = [
   'atkintl.h',
 ]
 
-content_files = [
-]
-
-html_images = [
-]
-
 glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
 glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
 docpath = join_paths(atk_datadir, 'gtk-doc', 'html')
 
 gnome.gtkdoc('atk',
-             main_xml: 'atk-docs.xml',
-             src_dir: [
-               join_paths(meson.source_root(), 'atk'),
-               join_paths(meson.build_root(), 'atk'),
-             ],
-             dependencies: libatk_dep,
-             gobject_typesfile: 'atk.types',
-             scan_args: [
-               '--rebuild-types',
-               '--deprecated-guards=ATK_DISABLE_DEPRECATED',
-               '--ignore-decorators=_ATK_EXTERN',
-               '--ignore-headers=' + ' '.join(private_headers),
-             ],
-             mkdb_args: [
-               '--output-format=xml',
-             ],
-             fixxref_args: [
-               '--html-dir=@0@'.format(docpath),
-               '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
-               '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
-             ],
-             html_assets: html_images,
-             install: true)
+  main_xml: 'atk-docs.xml',
+  src_dir: atk_inc,
+  dependencies: libatk_dep,
+  gobject_typesfile: 'atk.types',
+  scan_args: [
+    '--rebuild-types',
+    '--deprecated-guards=ATK_DISABLE_DEPRECATED',
+    '--ignore-decorators=_ATK_EXTERN',
+    '--ignore-headers=' + ' '.join(private_headers),
+  ],
+  mkdb_args: [
+    '--output-format=xml',
+  ],
+  fixxref_args: [
+    '--html-dir=@0@'.format(docpath),
+    '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+    '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+  ],
+  install: true,
+)
diff --git a/docs/xml/meson.build b/docs/xml/meson.build
index 91280ef..2a6a1f0 100644
--- a/docs/xml/meson.build
+++ b/docs/xml/meson.build
@@ -1,10 +1,14 @@
 ent_conf = configuration_data()
 ent_conf.set('PACKAGE', meson.project_name())
-ent_conf.set('PACKAGE_BUGREPORT', 'https://bugzilla.gnome.org/enter_bug.cgi?product=atk')
+ent_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/atk')
 ent_conf.set('PACKAGE_NAME', meson.project_name())
 ent_conf.set('PACKAGE_STRING', meson.project_name())
 ent_conf.set('PACKAGE_TARNAME', '@0@-@1@'.format(meson.project_name(), meson.project_version()))
 ent_conf.set('PACKAGE_URL', 'https://developer.gnome.org/atk/stable')
 ent_conf.set('PACKAGE_VERSION', meson.project_version())
 ent_conf.set('PACKAGE_API_VERSION', atk_api_version)
-configure_file(input: 'gtkdocentities.ent.in', output: 'gtkdocentities.ent', configuration: ent_conf)
+configure_file(
+  input: 'gtkdocentities.ent.in',
+  output: 'gtkdocentities.ent',
+  configuration: ent_conf,
+)