[gnome-builder] build: tweak dependency ordering



commit 134b52a83af02e09b3e2b333e6655bc25e0ae540
Author: Christian Hergert <chergert redhat com>
Date:   Thu Nov 9 00:18:50 2017 -0800

    build: tweak dependency ordering
    
    In hopes that we increase our chances for proper paths into the
    private directory before loading libgd from the public library
    paths loaded from system libraries.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=787578

 src/libide/meson.build              |   10 +++++-----
 src/plugins/command-bar/meson.build |    1 -
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/src/libide/meson.build b/src/libide/meson.build
index dd32cab..ecfa215 100644
--- a/src/libide/meson.build
+++ b/src/libide/meson.build
@@ -194,8 +194,8 @@ endif
 install_data('Ide.py', install_dir: pygobject_override_dir)
 
 libide_deps = [
-  libdazzle_dep,
   libgd_dep,
+  libdazzle_dep,
   libgio_dep,
   libgiounix_dep,
   libgtk_dep,
@@ -228,8 +228,8 @@ libide = shared_library('ide-' + libide_api_version,
 
 libide_dep = declare_dependency(
               sources: libide_generated_headers,
-         dependencies: [ libdazzle_dep,
-                         libgd_dep,
+         dependencies: [ libgd_dep,
+                         libdazzle_dep,
                          libgio_dep,
                          libgtk_dep,
                          libgtksource_dep,
@@ -245,8 +245,8 @@ libide_dep = declare_dependency(
 libide_plugin_dep = declare_dependency(
               sources: libide_generated_headers,
   include_directories: include_directories('.'),
-         dependencies: [ libdazzle_dep,
-                         libgd_dep,
+         dependencies: [ libgd_dep,
+                         libdazzle_dep,
                          libgio_dep,
                          libgtk_dep,
                          libgtksource_dep,
diff --git a/src/plugins/command-bar/meson.build b/src/plugins/command-bar/meson.build
index bee4fda..139844f 100644
--- a/src/plugins/command-bar/meson.build
+++ b/src/plugins/command-bar/meson.build
@@ -29,7 +29,6 @@ command_bar_sources = [
   'gb-vim.h',
 ]
 
-gnome_builder_plugins_deps += [libgd_dep]
 gnome_builder_plugins_sources += files(command_bar_sources)
 gnome_builder_plugins_sources += command_bar_resources[0]
 


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