[gnome-disk-utility] build: Order dependencies



commit 0f5c1601d71826ac7127665ffb0fe4ffac1d77b2
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Thu Jul 4 07:56:53 2019 +0200

    build: Order dependencies
    
    The order when looking for dependencies and in their use has been
    changed to be ordered alphabetically so their are easier to handle.

 meson.build                        | 13 +++++++------
 src/disk-image-mounter/meson.build |  4 ++--
 src/disks/meson.build              | 12 ++++++------
 src/libgdu/meson.build             |  6 +++---
 src/notify/meson.build             |  4 ++--
 5 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/meson.build b/meson.build
index a6398aeb..11a82004 100644
--- a/meson.build
+++ b/meson.build
@@ -68,16 +68,17 @@ endif
 
 add_project_arguments(compiler_flags, language: 'c')
 
-gmodule_dep = dependency('gmodule-2.0')
+dvdread_dep = dependency('dvdread', version: '>= 4.2.0')
 gio_unix_dep = dependency('gio-unix-2.0', version: '>= 2.31.0')
-udisk_dep = dependency('udisks2', version: '>= 2.7.6')
+gmodule_dep = dependency('gmodule-2.0')
 gtk_dep = dependency('gtk+-3.0', version: '>= 3.16.0')
-libsecret_dep = dependency('libsecret-1', version: '>= 0.7')
-pwquality_dep = dependency('pwquality', version: '>= 1.0.0')
 libcanberra_dep = dependency('libcanberra-gtk3', version: '>= 0.1')
-dvdread_dep = dependency('dvdread', version: '>= 4.2.0')
-libnotify_dep = dependency('libnotify', version: '>= 0.7')
 liblzma_dep = dependency('liblzma', version: '>= 5.0.5')
+libnotify_dep = dependency('libnotify', version: '>= 0.7')
+libsecret_dep = dependency('libsecret-1', version: '>= 0.7')
+pwquality_dep = dependency('pwquality', version: '>= 1.0.0')
+udisk_dep = dependency('udisks2', version: '>= 2.7.6')
+
 m_dep = cc.find_library('m')
 
 gio_schemasdir = dependency('gio-2.0').get_pkgconfig_variable(
diff --git a/src/disk-image-mounter/meson.build b/src/disk-image-mounter/meson.build
index 3a764216..6a0fb34e 100644
--- a/src/disk-image-mounter/meson.build
+++ b/src/disk-image-mounter/meson.build
@@ -1,11 +1,11 @@
 name = 'gnome-disk-image-mounter'
 
 deps = [
-  gmodule_dep,
   gio_unix_dep,
-  udisk_dep,
+  gmodule_dep,
   gtk_dep,
   libgdu_dep,
+  udisk_dep,
 ]
 
 cflags = [
diff --git a/src/disks/meson.build b/src/disks/meson.build
index 0e38ed6b..149c77d4 100644
--- a/src/disks/meson.build
+++ b/src/disks/meson.build
@@ -83,17 +83,17 @@ sources += gnome.mkenums(
 )
 
 deps = [
-  gmodule_dep,
+  dvdread_dep,
   gio_unix_dep,
-  udisk_dep,
+  gmodule_dep,
   gtk_dep,
-  libsecret_dep,
-  pwquality_dep,
   libcanberra_dep,
-  dvdread_dep,
-  liblzma_dep,
   libgdu_dep,
+  liblzma_dep,
+  libsecret_dep,
   m_dep,
+  pwquality_dep,
+  udisk_dep,
 ]
 
 cflags = [
diff --git a/src/libgdu/meson.build b/src/libgdu/meson.build
index 839f927f..59c8e04e 100644
--- a/src/libgdu/meson.build
+++ b/src/libgdu/meson.build
@@ -12,13 +12,13 @@ libgduenumtypes = gnome.mkenums(
 )
 
 deps = [
-  gmodule_dep,
   gio_unix_dep,
-  udisk_dep,
+  gmodule_dep,
   gtk_dep,
   libsecret_dep,
-  pwquality_dep,
   m_dep,
+  pwquality_dep,
+  udisk_dep,
 ]
 
 if enable_logind
diff --git a/src/notify/meson.build b/src/notify/meson.build
index d82a4b6b..2edc28ef 100644
--- a/src/notify/meson.build
+++ b/src/notify/meson.build
@@ -4,11 +4,11 @@ sources = files(
 )
 
 deps = [
-  gmodule_dep,
   gio_unix_dep,
-  udisk_dep,
+  gmodule_dep,
   gtk_dep,
   libnotify_dep,
+  udisk_dep,
 ]
 
 executable(


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