diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2018-04-27 11:58:59 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2018-05-17 15:02:03 +0100 |
| commit | a5e9828ca9d76a47b2783d4e6913ec35a657e304 (patch) | |
| tree | 0231dd1b6ad595013b6c0b9e822ea6e626881eaf | |
| parent | 547d84228b3cf54c4d29d05ec23b03e9e02e9c24 (diff) | |
| download | at-spi2-atk-a5e9828ca9d76a47b2783d4e6913ec35a657e304.tar.gz | |
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.
| -rw-r--r-- | atk-adaptor/meson.build | 12 | ||||
| -rw-r--r-- | atk-bridge-2.0.pc.in | 11 | ||||
| -rw-r--r-- | 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/atk-bridge-2.0.pc.in b/atk-bridge-2.0.pc.in deleted file mode 100644 index 449582f..0000000 --- a/atk-bridge-2.0.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: atk-bridge-2.0 -Description: ATK/D-Bus Bridge -Version: @VERSION@ -Requires.private: gobject-2.0 atspi-2 -Libs: -L${libdir} -latk-bridge-2.0 -Cflags: -I${includedir}/at-spi2-atk/2.0 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')) |