[gedit] build: simplify deps



commit e3dffbde737f40157b441a8bdd379c1a91db8193
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sat Mar 14 14:49:40 2020 +0100

    build: simplify deps
    
    GIO depends on GLib and GObject, so linking against GIO will link
    against GLib and GObject too.
    
    The glib and gobject dependency() is only needed in docs/reference/ for
    the gtk-doc fixxref.
    
    gmodule_dep was dead code.

 docs/reference/meson.build | 6 ++----
 gedit/meson.build          | 2 --
 meson.build                | 6 +-----
 3 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 463016553..1b686158b 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -1,7 +1,7 @@
-glib_prefix = glib_dep.get_pkgconfig_variable('prefix')
+glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
 glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html', 'glib')
 
-gobject_prefix = gobject_dep.get_pkgconfig_variable('prefix')
+gobject_prefix = dependency('gobject-2.0').get_pkgconfig_variable('prefix')
 gobject_docpath = join_paths(gobject_prefix, 'share', 'gtk-doc', 'html', 'gobject')
 
 gtk_prefix = gtk_dep.get_pkgconfig_variable('prefix')
@@ -11,8 +11,6 @@ tepl_prefix = tepl_dep.get_pkgconfig_variable('prefix')
 tepl_docpath = join_paths(tepl_prefix, 'share', 'gtk-doc', 'html', 'tepl-4.0')
 
 gedit_doc_deps = [
-  glib_dep,
-  gobject_dep,
   gio_dep,
   gtk_dep,
   gtksourceview_dep,
diff --git a/gedit/meson.build b/gedit/meson.build
index ff77676b5..8fd3d820e 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -110,8 +110,6 @@ libgedit_c_args = []
 libgedit_link_args = []
 
 libgedit_deps = [
-  glib_dep,
-  gobject_dep,
   gio_dep,
   gtk_dep,
   gtksourceview_dep,
diff --git a/meson.build b/meson.build
index d90254762..407bc05eb 100644
--- a/meson.build
+++ b/meson.build
@@ -50,13 +50,9 @@ libgd_subproject = subproject(
 libgd_dep = libgd_subproject.get_variable('libgd_dep')
 
 # Dependencies
-glib_req = '>= 2.52'
 libpeas_req = '>= 1.14.1'
 
-glib_dep = dependency('glib-2.0', version: glib_req)
-gobject_dep = dependency('gobject-2.0', version: glib_req)
-gmodule_dep = dependency('gmodule-2.0', version: glib_req)
-gio_dep = dependency('gio-2.0', version: glib_req)
+gio_dep = dependency('gio-2.0', version: '>= 2.52')
 gtk_dep = dependency('gtk+-3.0', version: '>= 3.22')
 gtksourceview_dep = dependency('gtksourceview-4', version: '>= 4.0.2')
 tepl_dep = dependency('tepl-4', version: '>= 4.4')


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