Build atk as part of at-spi2-core

This is basically about merging atk-toplevel-files/meson.build into
the toplevel meson.build, and fixing up some meson variable names.

One notable change is that ATK's version is kept separate from
at-spi2-core's version, namely in the atk_version variable from
meson.  This gets put as ATK_VERSION in config.h.

Then, atk_get_version() is changed to return that ATK_VERSION instead
of the plain VERSION, to avoid confusion.  (at-spi2-core does not put
a VERSION macro anywhere, so there's no chance of using the wrong
value, but I prefer to have a namespaced value with an ATK prefix.)

2 files changed, 9 insertions, 9 deletions

diff --git a/atk/atkutil.c b/atk/atkutil.c
index f5efa590..ec61612d 100644
--- a/atk/atkutil.c
+++ b/atk/atkutil.c
@@ -581,7 +581,7 @@ atk_get_toolkit_version (void)
 const gchar *
 atk_get_version (void)
 {
-  return VERSION;
+  return ATK_VERSION;
 }
 
 static void
diff --git a/atk/meson.build b/atk/meson.build
index d19bbbac..f3e37378 100644
--- a/atk/meson.build
+++ b/atk/meson.build
@@ -78,12 +78,12 @@ atk_version_conf.set('ATK_MICRO_VERSION', atk_micro_version)
 atk_version_conf.set('ATK_BINARY_AGE', atk_binary_age)
 atk_version_conf.set('ATK_INTERFACE_AGE', atk_interface_age)
 atk_version_conf.set('LT_CURRENT_MINUS_AGE', '0')
-atk_version_conf.set('ATK_VERSION', meson.project_version())
+atk_version_conf.set('ATK_VERSION', atk_version)
 
 atk_version_h = configure_file(input: 'atkversion.h.in',
   output: 'atkversion.h',
   configuration: atk_version_conf,
-  install_dir: join_paths(atk_includedir, atk_api_path),
+  install_dir: join_paths(atspi_includedir, atk_api_path),
 )
 
 # Marshallers
@@ -98,7 +98,7 @@ atk_enums = gnome.mkenums('atk-enum-types',
   sources: atk_headers,
   c_template: 'atk-enum-types.c.template',
   h_template: 'atk-enum-types.h.template',
-  install_dir: join_paths(atk_includedir, atk_api_path),
+  install_dir: join_paths(atspi_includedir, atk_api_path),
   install_header: true,
 )
 atk_enum_h = atk_enums[1]
@@ -109,7 +109,7 @@ atk_cflags = [
   '-DGLIB_DISABLE_DEPRECATION_WARNINGS',
   '-DATK_DISABLE_DEPRECATION_WARNINGS',
   '-DATK_COMPILATION',
-  '-DATK_LOCALEDIR="@0@"'.format(join_paths(atk_datadir, 'locale')),
+  '-DATK_LOCALEDIR="@0@"'.format(join_paths(atspi_datadir, 'locale')),
 ]
 
 if host_system == 'windows'
@@ -127,7 +127,7 @@ libatk = library(atk_api_name,
   soversion: atk_soversion,
   version: atk_libversion,
   install: true,
-  dependencies: glib_dep,
+  dependencies: [glib_dep, gobject_dep],
   include_directories: [ root_inc, atk_inc ],
   c_args: common_cflags + atk_cflags,
   link_args: common_ldflags,
@@ -135,7 +135,7 @@ libatk = library(atk_api_name,
 
 atk_sources_dep = [ atk_enum_h ]
 
-if get_option('introspection')
+if have_gir
   atk_sources_dep += gnome.generate_gir(libatk,
     sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ],
     namespace: 'Atk',
@@ -155,7 +155,7 @@ endif
 
 libatk_dep = declare_dependency(link_with: libatk,
   include_directories: [ root_inc, atk_inc ],
-  dependencies: glib_dep,
+  dependencies: [glib_dep, gobject_dep],
   sources: atk_sources_dep,
 )
 
@@ -164,5 +164,5 @@ pkgconfig.generate(libatk,
   description: 'Accessibility Toolkit',
   subdirs: atk_api_name,
   filebase: 'atk',
-  libraries: glib_dep,
+  libraries: [glib_dep, gobject_dep],
 )