From 2128efccae664ba12a870deb1720a08e58954dd2 Mon Sep 17 00:00:00 2001
From: Ernestas Kulik <ernestask@gnome.org>
Date: Tue, 30 Jan 2018 20:30:10 +0200
Subject: 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 +++++++++++++---------
 3 files changed, 20 insertions(+), 38 deletions(-)
 delete mode 100644 libnautilus-extension/libnautilus-extension-uninstalled.pc.in
 delete mode 100644 libnautilus-extension/libnautilus-extension.pc.in

(limited to 'libnautilus-extension')

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()
 )
-- 
cgit v1.2.1