[epiphany/wip/sync: 3/15] sync: Move code to lib/



commit 309475aaa35c1c04d73b7ce04e60e83c4404a00f
Author: Gabriel Ivascu <ivascu gabriel59 gmail com>
Date:   Sat Apr 29 17:13:32 2017 +0300

    sync: Move code to lib/

 lib/meson.build                                 |    1 +
 {src => lib}/sync/ephy-sync-crypto.c            |    0
 {src => lib}/sync/ephy-sync-crypto.h            |    0
 {src => lib}/sync/ephy-sync-service.c           |    0
 {src => lib}/sync/ephy-sync-service.h           |    0
 {src => lib}/sync/ephy-synchronizable-manager.c |    0
 {src => lib}/sync/ephy-synchronizable-manager.h |    0
 {src => lib}/sync/ephy-synchronizable.c         |    0
 {src => lib}/sync/ephy-synchronizable.h         |    0
 lib/sync/meson.build                            |   38 +++++++++++++++++++++++
 po/POTFILES.in                                  |    2 +-
 src/meson.build                                 |   12 +------
 12 files changed, 42 insertions(+), 11 deletions(-)
---
diff --git a/lib/meson.build b/lib/meson.build
index 2967ee9..78ce8fa 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -87,4 +87,5 @@ ephymisc_dep = declare_dependency(
   sources: enums
 )
 
+subdir('sync')
 subdir('widgets')
diff --git a/src/sync/ephy-sync-crypto.c b/lib/sync/ephy-sync-crypto.c
similarity index 100%
rename from src/sync/ephy-sync-crypto.c
rename to lib/sync/ephy-sync-crypto.c
diff --git a/src/sync/ephy-sync-crypto.h b/lib/sync/ephy-sync-crypto.h
similarity index 100%
rename from src/sync/ephy-sync-crypto.h
rename to lib/sync/ephy-sync-crypto.h
diff --git a/src/sync/ephy-sync-service.c b/lib/sync/ephy-sync-service.c
similarity index 100%
rename from src/sync/ephy-sync-service.c
rename to lib/sync/ephy-sync-service.c
diff --git a/src/sync/ephy-sync-service.h b/lib/sync/ephy-sync-service.h
similarity index 100%
rename from src/sync/ephy-sync-service.h
rename to lib/sync/ephy-sync-service.h
diff --git a/src/sync/ephy-synchronizable-manager.c b/lib/sync/ephy-synchronizable-manager.c
similarity index 100%
rename from src/sync/ephy-synchronizable-manager.c
rename to lib/sync/ephy-synchronizable-manager.c
diff --git a/src/sync/ephy-synchronizable-manager.h b/lib/sync/ephy-synchronizable-manager.h
similarity index 100%
rename from src/sync/ephy-synchronizable-manager.h
rename to lib/sync/ephy-synchronizable-manager.h
diff --git a/src/sync/ephy-synchronizable.c b/lib/sync/ephy-synchronizable.c
similarity index 100%
rename from src/sync/ephy-synchronizable.c
rename to lib/sync/ephy-synchronizable.c
diff --git a/src/sync/ephy-synchronizable.h b/lib/sync/ephy-synchronizable.h
similarity index 100%
rename from src/sync/ephy-synchronizable.h
rename to lib/sync/ephy-synchronizable.h
diff --git a/lib/sync/meson.build b/lib/sync/meson.build
new file mode 100644
index 0000000..b4e6a22
--- /dev/null
+++ b/lib/sync/meson.build
@@ -0,0 +1,38 @@
+libephysync_sources = [
+  'ephy-sync-crypto.c',
+  'ephy-sync-service.c',
+  'ephy-synchronizable-manager.c',
+  'ephy-synchronizable.c'
+]
+
+libephysync_deps = [
+  glib_dep,
+  gmp_dep,
+  hogweed_dep,
+  json_glib_dep,
+  libsecret_dep,
+  libsoup_dep,
+  nettle_dep,
+  webkit2gtk_dep
+]
+
+libephysync_includes = include_directories(
+  '.',
+  '..',
+  '../history',
+  '../widgets',
+  '../..',
+  '../../embed'
+)
+
+libephysync = static_library('ephysync',
+  libephysync_sources,
+  dependencies: libephysync_deps,
+  include_directories: libephysync_includes
+)
+
+ephysync_dep = declare_dependency(
+  link_with: libephysync,
+  dependencies: libephysync_deps,
+  include_directories: libephysync_includes
+)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8ca7f32..62bdad5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,6 +19,7 @@ lib/ephy-string.c
 lib/ephy-time-helpers.c
 lib/ephy-zoom.h
 lib/history/ephy-history-service-hosts-table.c
+lib/sync/ephy-sync-service.c
 lib/widgets/ephy-certificate-dialog.c
 lib/widgets/ephy-downloads-popover.c
 lib/widgets/ephy-download-widget.c
@@ -60,5 +61,4 @@ src/resources/gtk/prefs-lang-dialog.ui
 src/resources/gtk/search-engine-dialog.ui
 src/resources/gtk/shortcuts-dialog.ui
 src/search-provider/ephy-search-provider.c
-src/sync/ephy-sync-service.c
 src/window-commands.c
diff --git a/src/meson.build b/src/meson.build
index 38eae58..a06356b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -40,10 +40,6 @@ libephymain_sources = [
   'passwords-dialog.c',
   'popup-commands.c',
   'prefs-dialog.c',
-  'sync/ephy-sync-crypto.c',
-  'sync/ephy-sync-service.c',
-  'sync/ephy-synchronizable.c',
-  'sync/ephy-synchronizable-manager.c',
   'window-commands.c',
   enums
 ]
@@ -51,18 +47,14 @@ libephymain_sources = [
 libephymain_deps = [
   ephyembed_dep,
   ephymisc_dep,
+  ephysync_dep,
   ephywidgets_dep,
-  gmp_dep,
-  hogweed_dep,
-  json_glib_dep,
-  libnotify_dep,
-  nettle_dep
+  libnotify_dep
 ]
 
 libephymain_includes = include_directories(
   '.',
   'bookmarks',
-  'sync'
 )
 
 libephymain = shared_library('ephymain',


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