diff options
author | Ernestas Kulik <ernestask@gnome.org> | 2018-01-30 20:30:10 +0200 |
---|---|---|
committer | Ernestas Kulik <ernestask@gnome.org> | 2018-02-09 06:32:38 +0200 |
commit | 2128efccae664ba12a870deb1720a08e58954dd2 (patch) | |
tree | 5bbd644700dcb6ab3408398891e2293001c173ec | |
parent | 432f15dec785c51d9e9580450856ed4caec8ea6f (diff) | |
download | nautilus-2128efccae664ba12a870deb1720a08e58954dd2.tar.gz |
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.
-rw-r--r-- | libnautilus-extension/libnautilus-extension-uninstalled.pc.in | 12 | ||||
-rw-r--r-- | libnautilus-extension/libnautilus-extension.pc.in | 12 | ||||
-rw-r--r-- | libnautilus-extension/meson.build | 34 | ||||
-rw-r--r-- | meson.build | 1 |
4 files changed, 21 insertions, 38 deletions
diff --git a/libnautilus-extension/libnautilus-extension-uninstalled.pc.in b/libnautilus-extension/libnautilus-extension-uninstalled.pc.in deleted file mode 100644 index eee6aae81..000000000 --- a/libnautilus-extension/libnautilus-extension-uninstalled.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ -extensiondir=@libdir@/nautilus/extensions-3.0 - -Name: libnautilus-extension -Description: A library to create Nautilus view extensions -Version: @VERSION@ -Requires: glib-2.0 gio-2.0 gtk+-3.0 -Libs: ${pc_top_builddir}/${pcfiledir}/libnautilus-extension.la -Cflags: -I${pc_top_builddir}/${pcfiledir}/.. diff --git a/libnautilus-extension/libnautilus-extension.pc.in b/libnautilus-extension/libnautilus-extension.pc.in deleted file mode 100644 index 1da35854e..000000000 --- a/libnautilus-extension/libnautilus-extension.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ -extensiondir=@libdir@/nautilus/extensions-3.0 - -Name: libnautilus-extension -Description: A library to create Nautilus view extensions -Version: @VERSION@ -Requires: glib-2.0 gio-2.0 gtk+-3.0 -Libs: -L${libdir} -lnautilus-extension -Cflags: -I${includedir}/nautilus 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 |