build: Revise dependencies

gvfs is using a set of glib libraries (gio-2.0, gio-unix-2.0, glib,
gobject-2.0) in almost all the created objects. However, these
dependencies are not always necessary.

gvfs' meson port also uses some internal dependencies formed by
built libraries. This internal dependencies depend on other
dependendecies as well.

These both issues have been fixed by reviewing all the internal
dependencies and built objects.

https://bugzilla.gnome.org/show_bug.cgi?id=794365

1 files changed, 15 insertions, 10 deletions

diff --git a/metadata/meson.build b/metadata/meson.build
index 9eac0766..01fafe68 100644
--- a/metadata/meson.build
+++ b/metadata/meson.build
@@ -47,6 +47,11 @@ sources = files(
   'metatree.c'
 )
 
+deps = [
+  gio_dep,
+  glib_dep
+]
+
 cflags = [
   '-DDBUS_API_SUBJECT_TO_CHANGE',
   '-DG_LOG_DOMAIN="@0@"'.format(gvfs_name.to_upper()),
@@ -57,32 +62,32 @@ libmetadata = static_library(
   'metadata',
   sources: sources + [dbus_sources],
   include_directories: [top_inc, common_inc],
-  dependencies: glib_deps,
+  dependencies: deps + [gio_unix_dep],
   c_args: cflags,
   pic: true
 )
 
 libmetadata_dep = declare_dependency(
   sources: dbus_sources[1],
-  link_with: libmetadata,
   include_directories: include_directories('.'),
-  dependencies: glib_deps
+  dependencies: deps,
+  link_with: libmetadata
 )
 
-metadata_deps = [
-  libmetadata_dep,
-  libgvfscommon_dep
+deps = [
+  libgvfscommon_dep,
+  libmetadata_dep
 ]
 
 if enable_gudev
-  metadata_deps += gudev_dep
+  deps += gudev_dep
 endif
 
 executable(
   'gvfsd-metadata',
   'meta-daemon.c',
   include_directories: top_inc,
-  dependencies: metadata_deps,
+  dependencies: deps,
   c_args: cflags,
   install: true,
   install_rpath: gvfs_rpath,
@@ -103,8 +108,8 @@ if enable_devel_utils
       app + '.c',
       include_directories: top_inc,
       dependencies: [
-        libmetadata_dep,
-        libgvfscommon_dep
+        libgvfscommon_dep,
+        libmetadata_dep
       ],
       c_args: cflags
     )