[nautilus] nautilus-extension: use Meson to generate pkgconfig file
- From: Ernestas Kulik <ernestask src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] nautilus-extension: use Meson to generate pkgconfig file
- Date: Fri, 9 Feb 2018 04:44:05 +0000 (UTC)
commit 2128efccae664ba12a870deb1720a08e58954dd2
Author: Ernestas Kulik <ernestask gnome org>
Date: Tue Jan 30 20:30:10 2018 +0200
nautilus-extension: use Meson to generate pkgconfig file
Currently, the pkgconfig file for nautilus-extension is generated by
substituting variables in a template file. That is prone to mistakes and
requires manual tracking of dependencies. Using the pkgconfig module
from Meson helps automate much of the process.
.../libnautilus-extension-uninstalled.pc.in | 12 --------
libnautilus-extension/libnautilus-extension.pc.in | 12 --------
libnautilus-extension/meson.build | 34 +++++++++++++---------
meson.build | 1 +
4 files changed, 21 insertions(+), 38 deletions(-)
---
diff --git a/libnautilus-extension/meson.build b/libnautilus-extension/meson.build
index 0f63f9bf8..99dc4309e 100644
--- a/libnautilus-extension/meson.build
+++ b/libnautilus-extension/meson.build
@@ -70,18 +70,24 @@ nautilus_extension = declare_dependency(
include_directories: nautilus_include_dirs
)
-pkgconfig_data = configuration_data()
-
-pkgconfig_data.set('prefix', prefix)
-pkgconfig_data.set('exec_prefix', '${prefix}')
-pkgconfig_data.set('libdir', join_paths('${exec_prefix}', libdir))
-pkgconfig_data.set('includedir', join_paths('${prefix}', includedir))
-pkgconfig_data.set('extensiondir', join_paths('${exec_prefix}', extensiondir))
-pkgconfig_data.set('VERSION', meson.project_version())
-
-configure_file(
- input: 'libnautilus-extension.pc.in',
- output: 'libnautilus-extension.pc',
- configuration: pkgconfig_data,
- install_dir: join_paths(libdir, 'pkgconfig')
+pkgconfig.generate(
+ description: 'A library to create Nautilus view extensions',
+ filebase: 'libnautilus-extension',
+ libraries: [
+ libnautilus_extension
+ ],
+ name: 'libnautilus-extension',
+ subdirs: [
+ 'nautilus'
+ ],
+ requires: [
+ 'gio-2.0',
+ 'glib-2.0',
+ 'gtk+-3.0'
+ ],
+ variables: [
+ 'exec_prefix=${prefix}',
+ 'extensiondir=${libdir}/nautilus/extensions-3.0'
+ ],
+ version: meson.project_version()
)
diff --git a/meson.build b/meson.build
index 290b302fa..33b37dc9c 100644
--- a/meson.build
+++ b/meson.build
@@ -24,6 +24,7 @@ cc = meson.get_compiler('c')
# Imports
gnome = import('gnome')
i18n = import('i18n')
+pkgconfig = import('pkgconfig')
#
# Dependencies
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]