forked from pool/at-spi2-core
Dominique Leuenberger
9fbb7e7d85
Resub, spellfix OBS-URL: https://build.opensuse.org/request/show/640094 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/at-spi2-core?expand=0&rev=181
78 lines
2.1 KiB
Diff
78 lines
2.1 KiB
Diff
From 8a2107d67cf7a574f14836252d1952a5adea889f Mon Sep 17 00:00:00 2001
|
|
From: Soapux <nulldomain@gmail.com>
|
|
Date: Thu, 6 Sep 2018 11:56:49 -0500
|
|
Subject: [PATCH] meson: Generate a pkg-config file
|
|
|
|
Use Meson's pkgconfig module to generate the pkg-config file
|
|
for us instead of using a template.
|
|
---
|
|
atspi-2.pc.in | 11 -----------
|
|
atspi/meson.build | 10 ++++++++++
|
|
meson.build | 14 --------------
|
|
3 files changed, 10 insertions(+), 25 deletions(-)
|
|
delete mode 100644 atspi-2.pc.in
|
|
|
|
diff --git a/atspi-2.pc.in b/atspi-2.pc.in
|
|
deleted file mode 100644
|
|
index 71d028a..0000000
|
|
--- a/atspi-2.pc.in
|
|
+++ /dev/null
|
|
@@ -1,11 +0,0 @@
|
|
-prefix=@prefix@
|
|
-exec_prefix=@exec_prefix@
|
|
-libdir=@libdir@
|
|
-includedir=@includedir@
|
|
-
|
|
-Name: atspi
|
|
-Description: Accessibility Technology software library
|
|
-Requires: dbus-1 glib-2.0
|
|
-Version: @VERSION@
|
|
-Libs: -L${libdir} -latspi
|
|
-Cflags: -I${includedir}/at-spi-2.0
|
|
diff --git a/atspi/meson.build b/atspi/meson.build
|
|
index 1f8d021..b7a9357 100644
|
|
--- a/atspi/meson.build
|
|
+++ b/atspi/meson.build
|
|
@@ -113,3 +113,13 @@ if have_gir
|
|
)
|
|
endif
|
|
|
|
+pkgconfig = import('pkgconfig')
|
|
+pkgconfig.generate(
|
|
+ name: 'atspi',
|
|
+ description: 'Accessibility Technology software library',
|
|
+ version: meson.project_version(),
|
|
+ libraries: atspi,
|
|
+ requires: 'dbus-1 glib-2.0',
|
|
+ subdirs: 'at-spi-2.0',
|
|
+ filebase: 'atspi-2',
|
|
+)
|
|
diff --git a/meson.build b/meson.build
|
|
index 2b6ef8a..8ef8ae3 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -109,20 +109,6 @@ xgettext = find_program('xgettext', required : false)
|
|
|
|
configure_file(output: 'config.h', configuration: at_spi_conf)
|
|
|
|
-# Compat variables for pkgconfig
|
|
-pkgconf = configuration_data()
|
|
-pkgconf.set('prefix', get_option('prefix'))
|
|
-pkgconf.set('exec_prefix', get_option('prefix'))
|
|
-pkgconf.set('libdir', atspi_libdir)
|
|
-pkgconf.set('includedir', atspi_includedir)
|
|
-pkgconf.set('VERSION', meson.project_version())
|
|
-
|
|
-configure_file(input: 'atspi-2.pc.in',
|
|
- output: 'atspi-2.pc',
|
|
- configuration: pkgconf,
|
|
- install: true,
|
|
- install_dir: join_paths(get_option('libdir'), 'pkgconfig'))
|
|
-
|
|
gnome = import('gnome')
|
|
|
|
subdir('dbind')
|
|
--
|
|
2.18.0
|
|
|