[gedit/zbrown/deteplification-src: 343/633] build: improve the pkg_config.generate() call




commit e3c1dfc4f9dbf16ba8159241bbd043343c8ee2c8
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       |  9 ++++++---
 2 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/gedit/meson.build b/gedit/meson.build
index 97a16a750..ca4323fd1 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -227,14 +227,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', '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 9c9fdb76e..8147170ce 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'
@@ -57,11 +56,15 @@ gspell_dep = dependency('gspell-1', version: gspell_req)
 
 python3 = python.find_installation('python3')
 
-deps_basic_list = [
+libgedit_public_deps = [
   gio_dep,
   dependency('gtk+-3.0', version: gtk_req),
   dependency('gtksourceview-4', version: gtksourceview_req),
   dependency('libpeas-gtk-1.0', version: libpeas_req),
+]
+
+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]