Merge branch 'pkgconfig' into 'master'

meson: Generate a pkg-config file

See merge request GNOME/at-spi2-core!3

3 files changed, 10 insertions, 25 deletions

diff --git a/atspi-2.pc.in b/atspi-2.pc.in
deleted file mode 100644
index 71d028aa..00000000
--- 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 1f8d0210..b7a9357d 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 2b6ef8a2..8ef8ae3b 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')