diff options
-rw-r--r-- | atk-adaptor/adaptors/meson.build | 4 | ||||
-rw-r--r-- | atk-adaptor/meson.build | 6 | ||||
-rw-r--r-- | meson.build | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/atk-adaptor/adaptors/meson.build b/atk-adaptor/adaptors/meson.build index 11022d61..fcc2a6ae 100644 --- a/atk-adaptor/adaptors/meson.build +++ b/atk-adaptor/adaptors/meson.build @@ -23,9 +23,9 @@ libatk_bridge_adaptors = static_library('atk-bridge-adaptors', source, root_inc, include_directories('..'), ], - dependencies: [ libdbus_dep, atspi_dep, atk_dep ], + dependencies: [ libdbus_dep, atspi_dep, libatk_dep ], c_args: p2p_cflags) libatk_bridge_adaptors_dep = declare_dependency(link_with: libatk_bridge_adaptors, - dependencies: [ libdbus_dep, atspi_dep, atk_dep ], + dependencies: [ libdbus_dep, atspi_dep, libatk_dep ], include_directories: include_directories('.')) diff --git a/atk-adaptor/meson.build b/atk-adaptor/meson.build index 18d94274..9dca494e 100644 --- a/atk-adaptor/meson.build +++ b/atk-adaptor/meson.build @@ -22,7 +22,7 @@ libatk_bridge = library('atk-bridge-2.0', atk_bridge_sources, libdbus_dep, gmodule_dep, gobject_dep, - atk_dep, + libatk_dep, atspi_dep, ], c_args: p2p_cflags, @@ -41,7 +41,7 @@ atk_bridge_module = shared_module('atk-bridge', 'gtk-2.0/module.c', dependencies: [ libatk_bridge_dep, libdbus_dep, - atk_dep, + libatk_dep, atspi_dep, gmodule_dep, ], @@ -53,7 +53,7 @@ pkgconfig = import('pkgconfig') pkgconfig.generate( name: 'atk-bridge-2.0', description: 'ATK/D-Bus Bridge', - version: meson.project_version(), + version: atk_bridge_version, libraries: libatk_bridge, requires_private: ['gobject-2.0', 'atspi-2'], filebase: 'atk-bridge-2.0', diff --git a/meson.build b/meson.build index 04e8a4bd..098d3190 100644 --- a/meson.build +++ b/meson.build @@ -45,6 +45,7 @@ if cc.get_id() == 'msvc' endif # at-spi2-atk versions +atk_bridge_version = '2.38.0' atk_bridge_soversion = 0 atk_bridge_libversion = '0.0.0' @@ -217,6 +218,8 @@ subdir('atspi') subdir('bus') subdir('registryd') subdir('atk') +subdir('droute') +subdir('atk-adaptor') subdir('tests') if get_option('docs') |