[rhythmbox/mesonjunk: 3/9] build: merge source sync code into sources library

[Jonathan Matthew <jmatthew src gnome org>]

commit 9edd56ce25e01be9becad42816637e284ee82b71
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue May 24 22:37:55 2022 +1000

    build: merge source sync code into sources library
    
    The sync code isn't really usable separately, so we might as well
    simplify a bit by combining the libraries.

 meson.build              |  3 +--
 shell/meson.build        |  2 +-
 sources/meson.build      | 12 +++++++-----
 sources/sync/meson.build | 33 ---------------------------------
 widgets/meson.build      |  2 +-
 5 files changed, 10 insertions(+), 42 deletions(-)
---
diff --git a/meson.build b/meson.build
index de265901b..b6cbc3ce7 100644
--- a/meson.build
+++ b/meson.build
@@ -271,8 +271,7 @@ backendsinc = include_directories('backends')
 pluginsinc = include_directories('plugins')
 podcastinc = include_directories('podcast')
 shellinc = include_directories('shell')
-sourcesinc = include_directories('sources')
-sourcessyncinc = include_directories('sources/sync')
+sourcesinc = include_directories('sources', 'sources/sync')
 widgetsinc = include_directories('widgets')
 
 subdir('data')
diff --git a/shell/meson.build b/shell/meson.build
index 10c4c8ee8..f7ee6bead 100644
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -88,7 +88,7 @@ endif
 
 rhythmbox_core_include_directories = [
   configinc, libinc, mpidinc, metadatainc, rhythmdbinc, backendsinc, pluginsinc,
-  podcastinc, sourcesinc, sourcessyncinc, widgetsinc, include_directories('.'),
+  podcastinc, sourcesinc, widgetsinc, include_directories('.'),
 ]
 
 librhythmbox_core = shared_library('rhythmbox-core',
diff --git a/sources/meson.build b/sources/meson.build
index 49a75c43f..2afe79fae 100644
--- a/sources/meson.build
+++ b/sources/meson.build
@@ -1,5 +1,3 @@
-subdir('sync')
-
 sources_headers = files(
   'rb-auto-playlist-source.h',
   'rb-browser-source.h',
@@ -41,7 +39,11 @@ sources_sources = files(
   'rb-source.c',
   'rb-static-playlist-source.c',
   'rb-streaming-source.c',
-  'rb-transfer-target.c'
+  'rb-transfer-target.c',
+  'sync/rb-sync-settings.c',
+  'sync/rb-sync-settings-ui.c',
+  'sync/rb-sync-state.c',
+  'sync/rb-sync-state-ui.c',
 )
 
 sources_c_args = [
@@ -60,9 +62,9 @@ sources_dependencies = [totem_plparser, gstreamer_pbutils, gtk]
 
 sources_lib = static_library('sources', sources_sources,
   c_args: sources_c_args,
-  include_directories: [configinc, shellinc, sourcesinc, widgetsinc],
+  include_directories: [configinc, shellinc, sourcesinc, widgetsinc, include_directories('sync')],
   dependencies: sources_dependencies + [librb_dep, rhythmdb_dep,
-    rbbackends_dep, rbmetadata_dep, sourcesync_dep],
+    rbbackends_dep, rbmetadata_dep, rbpodcast_dep],
   install: false,
 )
 
diff --git a/widgets/meson.build b/widgets/meson.build
index ef5523ffe..1bf39ab08 100644
--- a/widgets/meson.build
+++ b/widgets/meson.build
@@ -59,7 +59,7 @@ rbwidgets_lib = static_library('rbwidgets',
   widgets_sources,
   dependencies: widgets_dependencies + [librb_dep, rhythmdb_dep, rbmetadata_dep,
   rbbackends_dep, rbpodcast_dep, sources_dep],
-  include_directories: [pluginsinc, shellinc, sourcessyncinc, widgetsinc])
+  include_directories: [pluginsinc, shellinc, widgetsinc])
 
 rbwidgets_dep = declare_dependency(
   link_with: rbwidgets_lib,