summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2018-08-11 14:59:22 +0200
committerIñigo Martínez <inigomartinez@gmail.com>2018-08-11 22:57:34 +0200
commit0dba400d5807927f583a243c42f90827071c1c6f (patch)
treefab9c0bc983a67b1e3034f9a36a99e29ae65d338
parent76f60f47e54eae63cf0d979c9260f4aa142177b1 (diff)
downloaddconf-0dba400d5807927f583a243c42f90827071c1c6f.tar.gz
build: Simplified pkg-config file generation
Since meson's 0.46 version, the `pkg-config` file generation has been simplified[0]. This new improvements has been used to generate the same `pkg-config` file by using less parameters. meson version has also been bumped accordingly to 0.46. [0] http://mesonbuild.com/Release-notes-for-0-46-0.html#improvements-to-pkgconfig-module
-rw-r--r--client/meson.build5
-rw-r--r--meson.build2
2 files changed, 2 insertions, 5 deletions
diff --git a/client/meson.build b/client/meson.build
index 703f42d..9153b06 100644
--- a/client/meson.build
+++ b/client/meson.build
@@ -46,11 +46,8 @@ libdconf_dep = declare_dependency(
)
pkg.generate(
- libraries: libdconf,
- version: meson.project_version(),
- name: 'dconf',
+ libdconf,
description: 'dconf client library',
- filebase: 'dconf',
subdirs: 'dconf',
requires: 'gio-2.0 ' + gio_req_version,
variables: 'exec_prefix=${prefix}',
diff --git a/meson.build b/meson.build
index 3aef1b9..a7497f1 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project(
'dconf', ['c', 'vala'],
version: '0.28.0',
license: 'LGPL2.1+',
- meson_version: '>= 0.43.0',
+ meson_version: '>= 0.46.0',
)
dconf_prefix = get_option('prefix')