[gedit/zbrown/deteplification-src: 183/633] build: simplify deps
- From: Zander Brown <zbrown src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit/zbrown/deteplification-src: 183/633] build: simplify deps
- Date: Sat, 10 Apr 2021 12:47:57 +0000 (UTC)
commit 9c13fee0d2be09b75c7d8d644f9d0c3027c93a69
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, 2 insertions(+), 12 deletions(-)
---
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index fe3c1b3f0..7509fb100 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -1,15 +1,13 @@
-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')
gtk_docpath = join_paths(gobject_prefix, 'share', 'gtk-doc', 'html', 'gtk')
gedit_doc_deps = [
- glib_dep,
- gobject_dep,
gio_dep,
gtk_dep,
gtksourceview_dep,
diff --git a/gedit/meson.build b/gedit/meson.build
index 433958daf..d1ec6dedc 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -120,8 +120,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 c31095015..df803ea59 100644
--- a/meson.build
+++ b/meson.build
@@ -50,9 +50,6 @@ libgd_subproject = subproject(
libgd_dep = libgd_subproject.get_variable('libgd_dep')
# Dependencies
-glib_req = '>= 2.52'
-gtk_req = '>= 3.22.0'
-gtksourceview_req = '>= 4.0.2'
libpeas_req = '>= 1.14.1'
libxml_req = '>= 2.5.0'
libsoup_req = '>= 2.60.0'
@@ -61,9 +58,6 @@ pygobject_req = '>= 3.0.0'
introspection_req = '>= 0.9.3'
vala_req = '>= 0.25.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)
gtk_dep = dependency('gtk+-3.0', version: gtk_req)
gtksourceview_dep = dependency('gtksourceview-4', version: gtksourceview_req)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]