[at-spi2-atk] Generate the atk-bridge-2.0 pkg-config file
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-atk] Generate the atk-bridge-2.0 pkg-config file
- Date: Thu, 17 May 2018 14:04:32 +0000 (UTC)
commit a5e9828ca9d76a47b2783d4e6913ec35a657e304
Author: Emmanuele Bassi <ebassi gnome org>
Date: Fri Apr 27 11:58:59 2018 +0100
Generate the atk-bridge-2.0 pkg-config file
Instead of using a template, we can ask Meson to generate the file for
us from the various build targets.
atk-adaptor/meson.build | 12 ++++++++++++
atk-bridge-2.0.pc.in | 11 -----------
meson.build | 13 -------------
3 files changed, 12 insertions(+), 24 deletions(-)
---
diff --git a/atk-adaptor/meson.build b/atk-adaptor/meson.build
index 16ca9c7..b5f6fc5 100644
--- a/atk-adaptor/meson.build
+++ b/atk-adaptor/meson.build
@@ -47,3 +47,15 @@ atk_bridge_module = shared_module('atk-bridge', 'gtk-2.0/module.c',
c_args: p2p_cflags,
install: true,
install_dir: join_paths(get_option('libdir'), 'gtk-2.0', 'modules'))
+
+pkgconfig = import('pkgconfig')
+pkgconfig.generate(
+ name: 'atk-bridge-2.0',
+ description: 'ATK/D-Bus Bridge',
+ version: meson.project_version(),
+ libraries: libatk_bridge,
+ requires_private: ['gobject-2.0', 'atspi-2'],
+ filebase: 'atk-bridge-2.0',
+ subdirs: 'at-spi2-atk/2.0',
+ install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
+)
diff --git a/meson.build b/meson.build
index 72b5b99..6928cbd 100644
--- a/meson.build
+++ b/meson.build
@@ -56,19 +56,6 @@ else
p2p_cflags = []
endif
-pkg_conf = configuration_data()
-pkg_conf.set('prefix', get_option('prefix'))
-pkg_conf.set('exec_prefix', get_option('prefix'))
-pkg_conf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
-pkg_conf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
-pkg_conf.set('VERSION', meson.project_version())
-
-configure_file(input: 'atk-bridge-2.0.pc.in',
- output: 'atk-bridge-2.0.pc',
- configuration: pkg_conf,
- install: true,
- install_dir: join_paths(get_option('libdir'), 'pkgconfig'))
-
install_data('at-spi2-atk.desktop',
install_dir: join_paths(get_option('libdir'), 'gnome-settings-daemon-3.0', 'gtk-modules'))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]