[gthumb] meson: fixed dependencies between extensions

[Paolo Bacchilega <paobac src gnome org>]

commit 7c69a7799a2f7c21d20ffef2524e072fe1c705ce
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Mon Oct 23 16:57:33 2017 +0200

    meson: fixed dependencies between extensions

 extensions/facebook/meson.build        |    7 ++++++-
 extensions/file_tools/meson.build      |    8 +++++++-
 extensions/flicker/meson.build         |    7 ++++++-
 extensions/flicker_utils/meson.build   |    7 ++++++-
 extensions/importer/meson.build        |    1 +
 extensions/photo_importer/meson.build  |   11 +++++++++--
 extensions/picasaweb/meson.build       |    7 ++++++-
 extensions/red_eye_removal/meson.build |   16 +++++++++++++---
 8 files changed, 54 insertions(+), 10 deletions(-)
---
diff --git a/extensions/facebook/meson.build b/extensions/facebook/meson.build
index 7dbf424..2513d73 100644
--- a/extensions/facebook/meson.build
+++ b/extensions/facebook/meson.build
@@ -15,12 +15,17 @@ shared_module('facebook',
   sources : source_files,
   dependencies : [
     extension_common_deps,
+    importer_dep,
     libsoup_dep,
     libjson_glib_dep,
     webkit2_dep,
     use_libsecret ? libsecret_dep : [],    
   ],
-  include_directories : [ config_inc, gthumb_inc ],
+  include_directories : [ 
+    config_inc, 
+    gthumb_inc,
+    importer_inc 
+  ],
   c_args : c_args,
   link_with : [
     oauth_mod,
diff --git a/extensions/file_tools/meson.build b/extensions/file_tools/meson.build
index 2542529..a061b4f 100644
--- a/extensions/file_tools/meson.build
+++ b/extensions/file_tools/meson.build
@@ -77,13 +77,19 @@ source_files = files(
 file_tools_mod = shared_module('file_tools', 
   sources : [ source_files, enum_files ],
   dependencies : extension_common_deps, 
-  include_directories : [ config_inc, gthumb_inc ],
+  include_directories : [ 
+    config_inc, 
+    gthumb_inc 
+  ],
   c_args : c_args,
   link_with : image_viewer_mod,
   install : true,
   install_dir : extensions_install_dir
 )
 
+file_tools_inc = include_directories('.')
+file_tools_dep = declare_dependency(sources : enum_files)
+
 # .extension file
 
 extension_in_file = configure_file(
diff --git a/extensions/flicker/meson.build b/extensions/flicker/meson.build
index 7d27ecc..f2f335f 100644
--- a/extensions/flicker/meson.build
+++ b/extensions/flicker/meson.build
@@ -9,10 +9,15 @@ shared_module('flicker',
   sources : source_files,
   dependencies : [
     extension_common_deps,
+    importer_dep,
     libsoup_dep,
     use_libsecret ? libsecret_dep : [],    
   ],
-  include_directories : [ config_inc, gthumb_inc ],
+  include_directories : [ 
+    config_inc, 
+    gthumb_inc,
+    importer_inc
+  ],
   c_args : c_args,
   link_with : [
     flicker_utils_mod,
diff --git a/extensions/flicker_utils/meson.build b/extensions/flicker_utils/meson.build
index f3834a0..0fdcc02 100644
--- a/extensions/flicker_utils/meson.build
+++ b/extensions/flicker_utils/meson.build
@@ -14,10 +14,15 @@ flicker_utils_mod = shared_module('flicker_utils',
   sources : source_files,
   dependencies : [
     extension_common_deps,
+    importer_dep,
     libsoup_dep,
     use_libsecret ? libsecret_dep : [],    
   ],
-  include_directories : [ config_inc, gthumb_inc ],
+  include_directories : [ 
+    config_inc, 
+    gthumb_inc,
+    importer_inc 
+  ],
   c_args : c_args,
   link_with : [
     oauth_mod,
diff --git a/extensions/importer/meson.build b/extensions/importer/meson.build
index 5158429..4b02305 100644
--- a/extensions/importer/meson.build
+++ b/extensions/importer/meson.build
@@ -31,6 +31,7 @@ importer_mod = shared_module('importer',
 )
 
 importer_inc = include_directories('.')
+importer_dep = declare_dependency(sources : enum_files)
 
 # .extension file
 
diff --git a/extensions/photo_importer/meson.build b/extensions/photo_importer/meson.build
index a30f000..441826e 100644
--- a/extensions/photo_importer/meson.build
+++ b/extensions/photo_importer/meson.build
@@ -10,8 +10,15 @@ gresource_files = gnome.compile_resources('photo-importer-resources', 'resources
 
 photo_importer_mod = shared_module('photo_importer', 
   sources : [ source_files, gresource_files ],
-  dependencies : extension_common_deps,
-  include_directories : [ config_inc, gthumb_inc ],
+  dependencies : [
+    extension_common_deps,
+    importer_dep
+  ],
+  include_directories : [ 
+    config_inc, 
+    gthumb_inc,
+    importer_inc
+  ],
   c_args : c_args,
   link_with : [ 
     catalogs_mod, 
diff --git a/extensions/picasaweb/meson.build b/extensions/picasaweb/meson.build
index 81c0bc5..271c7fb 100644
--- a/extensions/picasaweb/meson.build
+++ b/extensions/picasaweb/meson.build
@@ -15,11 +15,16 @@ shared_module('picasaweb',
   sources : source_files,
   dependencies : [
     extension_common_deps,
+    importer_dep,
     libsoup_dep,
     libjson_glib_dep,
     use_libsecret ? libsecret_dep : [],    
   ],
-  include_directories : [ config_inc, gthumb_inc ],
+  include_directories : [ 
+    config_inc, 
+    gthumb_inc,
+    importer_inc
+  ],
   c_args : c_args,
   link_with : [
     importer_mod,
diff --git a/extensions/red_eye_removal/meson.build b/extensions/red_eye_removal/meson.build
index cbd6fc1..751f390 100644
--- a/extensions/red_eye_removal/meson.build
+++ b/extensions/red_eye_removal/meson.build
@@ -5,10 +5,20 @@ source_files = files(
 
 shared_module('red_eye_removal', 
   sources : source_files,
-  dependencies : [ extension_common_deps ],
-  include_directories : [ config_inc, gthumb_inc ],
+  dependencies : [ 
+    extension_common_deps,
+    file_tools_dep 
+  ],
+  include_directories : [ 
+    config_inc, 
+    gthumb_inc,
+    file_tools_inc
+  ],
   c_args : c_args,
-  link_with: [ image_viewer_mod ],
+  link_with: [
+    file_tools_mod, 
+    image_viewer_mod 
+  ],
   install : true,
   install_dir : extensions_install_dir
 )