[gedit] build: improve the pkg_config.generate() call



commit 2bad32a7f28f1d4b2ef0f004ffc50d2f1664dc69
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri May 8 21:53:03 2020 +0200

    build: improve the pkg_config.generate() call

 gedit/meson.build | 12 ++++++------
 meson.build       | 12 ++++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/gedit/meson.build b/gedit/meson.build
index 522d171e6..d4e541d60 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -218,14 +218,14 @@ libgedit_dep = declare_dependency(
   dependencies: libgedit_deps,
 )
 
-libgedit_pc = pkg.generate(
-  name: meson.project_name(),
+pkg_config.generate(
+  libgedit_shared_lib,
+  filebase: 'gedit',
+  name: 'gedit',
   description: 'GNOME text editor',
-  requires: ['gtksourceview-4', 'tepl-5', 'libpeas-1.0', 'libpeas-gtk-1.0'],
-  version: meson.project_version(),
   subdirs: 'gedit-@0@'.format(api_version),
-  libraries: libgedit_shared_lib,
-  install_dir: pkgconfigdir,
+  libraries: libgedit_public_deps,
+  install_dir: get_option('libdir') / 'pkgconfig'
 )
 
 libgedit_sources = [
diff --git a/meson.build b/meson.build
index f416826d6..6604638d9 100644
--- a/meson.build
+++ b/meson.build
@@ -10,7 +10,7 @@ endif
 
 gnome = import('gnome')
 i18n = import('i18n')
-pkg = import('pkgconfig')
+pkg_config = import('pkgconfig')
 python = import('python')
 
 api_version = '3.38'
@@ -21,7 +21,6 @@ root_include_dir = include_directories('.')
 srcdir = meson.current_source_dir()
 
 bindir = get_option('prefix') / get_option('bindir')
-pkgconfigdir = get_option('prefix') / get_option('libdir') / 'pkgconfig'
 pkglibdir = get_option('prefix') / get_option('libdir') / 'gedit'
 pkgdatadir = get_option('prefix') / get_option('datadir') / 'gedit'
 glibdir = get_option('prefix') / get_option('datadir') / 'glib-2.0'
@@ -43,11 +42,16 @@ libgd_dep = libgd_subproject.get_variable('libgd_dep')
 
 # Dependencies
 gio_dep = dependency('gio-2.0', version: '>= 2.64')
-deps_basic_list = [
+
+libgedit_public_deps = [
   gio_dep,
   dependency('gtk+-3.0', version: '>= 3.22'),
   dependency('tepl-5', version: '>= 4.99.1'),
-  dependency('libpeas-gtk-1.0', version: '>= 1.14.1'),
+  dependency('libpeas-gtk-1.0'),
+]
+
+deps_basic_list = [
+  libgedit_public_deps,
   dependency('gobject-introspection-1.0'),
 ]
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]