[gnome-photos/wip/rishi/src-meson.build-clean-up: 5/5] build: Shuffle the dependencies around




commit 35075fa8795e7db3f99d45478e6ed00b9098e297
Author: Debarshi Ray <debarshir gnome org>
Date:   Sat Mar 20 22:12:21 2021 +0100

    build: Shuffle the dependencies around
    
    Subsequent commits will absorb the online miners, which means that a
    few more binaries will be generated during the build. This will
    complicate the concept of "common dependencies". Therefore, just
    flatten the list of dependencies.
    
    https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/190

 src/meson.build | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index acd86a28..276ca35e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -93,17 +93,6 @@ libgnome_photos = shared_library(
 
 libgnome_photos_dep = declare_dependency(link_with: libgnome_photos, sources: libgnome_photos_built_headers)
 
-common_deps = [
-  gdk_pixbuf_dep,
-  gegl_dep,
-  gio_dep,
-  gio_unix_dep,
-  glib_dep,
-  gobject_dep,
-  libdazzle_dep,
-  libgnome_photos_dep,
-]
-
 gnome_photos_sources = files(
   'photos-application.c',
   'photos-base-manager.c',
@@ -379,19 +368,27 @@ gnome_photos_sources += gnome.gdbus_codegen(
   autocleanup: 'all',
 )
 
-deps = common_deps + [
+deps = [
   babl_dep,
   cairo_dep,
+  gdk_pixbuf_dep,
+  gegl_dep,
   geocode_glib_dep,
   gexiv_dep,
+  gio_dep,
+  gio_unix_dep,
+  glib_dep,
   goa_dep,
+  gobject_dep,
   grilo_dep,
   gsettings_desktop_schemas_dep,
   gtk_dep,
   gtk_unix_print_dep,
+  libdazzle_dep,
   libgd_dep,
   libgdata_dep,
   libgfgraph_dep,
+  libgnome_photos_dep,
   libhandy_dep,
   m_dep,
   tracker_sparql_dep,
@@ -419,11 +416,22 @@ gnome_photos_thumbnailer_sources = files(
   'photos-thumbnailer-main.c',
 )
 
+deps = [
+  gdk_pixbuf_dep,
+  gegl_dep,
+  gio_dep,
+  gio_unix_dep,
+  glib_dep,
+  gobject_dep,
+  libdazzle_dep,
+  libgnome_photos_dep,
+]
+
 executable(
   meson.project_name() + '-thumbnailer',
   gnome_photos_thumbnailer_sources,
   include_directories: top_inc,
-  dependencies: common_deps,
+  dependencies: deps,
   c_args: cflags,
   install: true,
   install_dir: photos_libexecdir,


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