GNOME.org
 

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

commit 4248809bf5e8510191e88e88a37daa3a5da0761a
Author: Gabriel Ivascu <ivascu gabriel59 gmail com>
Date:   Tue Apr 25 18:04:44 2017 +0300

    sync: Move code to lib/

 configure.ac                                    |    1 +
 lib/Makefile.am                                 |    4 ++-
 lib/sync/Makefile.am                            |   45 +++++++++++++++++++++++
 {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
 po/POTFILES.in                                  |    2 +-
 src/Makefile.am                                 |   28 ++-------------
 src/profile-migrator/Makefile.am                |    2 +-
 src/search-provider/Makefile.am                 |    2 +-
 tests/Makefile.am                               |    2 +-
 16 files changed, 56 insertions(+), 30 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 92fd717..eebd0f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,6 +210,7 @@ libgd/Makefile
 lib/Makefile
 lib/egg/Makefile
 lib/history/Makefile
+lib/sync/Makefile
 lib/widgets/Makefile
 embed/Makefile
 embed/web-extension/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index bd2767f..2aaca54 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = widgets egg history
+SUBDIRS = egg history sync widgets
 
 pkglib_LTLIBRARIES = libephymisc.la
 
@@ -72,6 +72,7 @@ libephymisc_la_CPPFLAGS = \
        -DTOP_SRC_DATADIR=\"$(top_srcdir)/data\"        \
        -I$(top_builddir)/lib                           \
        -I$(top_srcdir)/lib/egg                         \
+       -I$(top_srcdir)/lib/sync                        \
        $(CAIRO_CFLAGS)                                 \
        $(GDK_PIXBUF_CFLAGS)                            \
        $(GDK_X11_CFLAGS)                               \
@@ -94,6 +95,7 @@ libephymisc_la_LDFLAGS = \
 
 libephymisc_la_LIBADD = \
        $(top_builddir)/lib/history/libephyhistory.la \
+       $(top_builddir)/lib/sync/libephysync.la \
        $(CAIRO_LIBS)           \
        $(GDK_PIXBUF_LIBS)      \
        $(GDK_X11_LIBS)         \
diff --git a/lib/sync/Makefile.am b/lib/sync/Makefile.am
new file mode 100644
index 0000000..2dd84d3
--- /dev/null
+++ b/lib/sync/Makefile.am
@@ -0,0 +1,45 @@
+noinst_LTLIBRARIES = libephysync.la
+
+libephysync_la_SOURCES = \
+       ephy-sync-crypto.c              \
+       ephy-sync-crypto.h              \
+       ephy-sync-service.c             \
+       ephy-sync-service.h             \
+       ephy-synchronizable.c           \
+       ephy-synchronizable.h           \
+       ephy-synchronizable-manager.c   \
+       ephy-synchronizable-manager.h
+
+libephysync_la_CFLAGS = \
+       $(WARN_CFLAGS)
+
+libephysync_la_CPPFLAGS = \
+       -I$(top_builddir)/lib           \
+       -I$(top_builddir)/lib/sync      \
+       -I$(top_srcdir)/embed           \
+       -I$(top_srcdir)/lib             \
+       -I$(top_srcdir)/lib/history     \
+       -I$(top_srcdir)/lib/widgets     \
+       $(GLIB_CFLAGS)                  \
+       $(GTK_CFLAGS)                   \
+       $(HOGWEED_CFLAGS)               \
+       $(JSON_GLIB_CFLAGS)             \
+       $(LIBNOTIFY_CFLAGS)             \
+       $(LIBSECRET_CFLAGS)             \
+       $(LIBSOUP_CFLAGS)               \
+       $(NETTLE_CFLAGS)                \
+       $(WEBKIT2GTK_CFLAGS)
+
+libephysync_la_LDFLAGS = \
+       $(WARN_LDFLAGS)
+
+libephysync_la_LIBADD = \
+       $(GLIB_LIBS)            \
+       $(GTK_LIBS)             \
+       $(HOGWEED_LIBS)         \
+       $(JSON_GLIB_LIBS)       \
+       $(LIBNOTIFY_LIBS)       \
+       $(LIBSECRET_LIBS)       \
+       $(LIBSOUP_LIBS)         \
+       $(NETTLE_LIBS)          \
+       $(WEBKIT2GTK_LIBS)
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/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/Makefile.am b/src/Makefile.am
index 5e6a866..7192f78 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,15 +72,7 @@ libephymain_la_SOURCES = \
        prefs-dialog.c                          \
        prefs-dialog.h                          \
        window-commands.c                       \
-       window-commands.h                       \
-       sync/ephy-sync-crypto.c                 \
-       sync/ephy-sync-crypto.h                 \
-       sync/ephy-sync-service.c                \
-       sync/ephy-sync-service.h                \
-       sync/ephy-synchronizable.c              \
-       sync/ephy-synchronizable.h              \
-       sync/ephy-synchronizable-manager.c      \
-       sync/ephy-synchronizable-manager.h
+       window-commands.h
 
 nodist_libephymain_la_SOURCES = \
        $(TYPES_SOURCE)
@@ -94,22 +86,18 @@ libephymain_la_CPPFLAGS = \
        -I$(top_srcdir)/lib             \
        -I$(top_srcdir)/lib/egg         \
        -I$(top_srcdir)/lib/history     \
+       -I$(top_srcdir)/lib/sync        \
        -I$(top_srcdir)/lib/widgets     \
        -I$(top_srcdir)/src/bookmarks   \
-       -I$(top_srcdir)/src/sync        \
        -DLOCALEDIR=\"$(localedir)\"    \
        -DPKGDATADIR=\"$(pkgdatadir)\"  \
        $(GDK_CFLAGS)                   \
        $(GIO_CFLAGS)                   \
        $(GLIB_CFLAGS)                  \
        $(GTK_CFLAGS)                   \
-       $(HOGWEED_CFLAGS)               \
        $(JSON_GLIB_CFLAGS)             \
-       $(LIBNOTIFY_CFLAGS)             \
        $(LIBSECRET_CFLAGS)             \
-       $(LIBSOUP_CFLAGS)               \
        $(LIBXML_CFLAGS)                \
-       $(NETTLE_CFLAGS)                \
        $(WEBKIT2GTK_CFLAGS)
 
 libephymain_la_CFLAGS = \
@@ -128,13 +116,9 @@ libephymain_la_LIBADD = \
        $(GIO_LIBS)             \
        $(GLIB_LIBS)            \
        $(GTK_LIBS)             \
-       $(HOGWEED_LIBS)         \
        $(JSON_GLIB_LIBS)       \
-       $(LIBNOTIFY_LIBS)       \
        $(LIBSECRET_LIBS)       \
-       $(LIBSOUP_LIBS)         \
        $(LIBXML_LIBS)          \
-       $(NETTLE_LIBS)          \
        $(WEBKIT2GTK_LIBS)
 
 RESOURCE_FILES = \
@@ -194,19 +178,16 @@ epiphany_CPPFLAGS = \
        -I$(top_srcdir)/lib             \
        -I$(top_srcdir)/lib/egg         \
        -I$(top_srcdir)/lib/history     \
+       -I$(top_srcdir)/lib/sync        \
        -I$(top_srcdir)/lib/widgets     \
        -I$(top_builddir)/lib/widgets   \
        -I$(top_srcdir)/src/bookmarks   \
-       -I$(top_srcdir)/src/sync        \
        -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
        -DLOCALEDIR=\"$(localedir)\"    \
        $(GLIB_CFLAGS)                  \
        $(GTK_CFLAGS)                   \
-       $(HOGWEED_CFLAGS)               \
        $(JSON_GLIB_CFLAGS)             \
-       $(LIBNOTIFY_CFLAGS)             \
        $(LIBXML_CFLAGS)                \
-       $(NETTLE_CFLAGS)                \
        $(WEBKIT2GTK_CFLAGS)
 
 epiphany_LDADD = \
@@ -214,11 +195,8 @@ epiphany_LDADD = \
        libephymain.la          \
        $(GLIB_LIBS)            \
        $(GTK_LIBS)             \
-       $(HOGWEED_LIBS)         \
        $(JSON_GLIB_LIBS)       \
-       $(LIBNOTIFY_LIBS)       \
        $(LIBXML_LIBS)          \
-       $(NETTLE_LIBS)          \
        $(WEBKIT2GTK_LIBS)
 
 epiphany_LDFLAGS = \
diff --git a/src/profile-migrator/Makefile.am b/src/profile-migrator/Makefile.am
index 24a2709..457d9d9 100644
--- a/src/profile-migrator/Makefile.am
+++ b/src/profile-migrator/Makefile.am
@@ -11,9 +11,9 @@ ephy_profile_migrator_CPPFLAGS = \
        -I$(top_srcdir)/embed                           \
        -I$(top_srcdir)/lib                             \
        -I$(top_srcdir)/lib/history                     \
+       -I$(top_srcdir)/lib/sync                        \
        -I$(top_srcdir)/src/                            \
        -I$(top_srcdir)/src/bookmarks                   \
-       -I$(top_srcdir)/src/sync                        \
        -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"        \
        -DLOCALEDIR=\"$(localedir)\"                    \
        $(GLIB_CFLAGS)                                  \
diff --git a/src/search-provider/Makefile.am b/src/search-provider/Makefile.am
index 8141527..8292d67 100644
--- a/src/search-provider/Makefile.am
+++ b/src/search-provider/Makefile.am
@@ -22,9 +22,9 @@ epiphany_search_provider_CPPFLAGS = \
        -I$(top_srcdir)/embed           \
        -I$(top_srcdir)/lib             \
        -I$(top_srcdir)/lib/history     \
+       -I$(top_srcdir)/lib/sync        \
        -I$(top_srcdir)/src             \
        -I$(top_srcdir)/src/bookmarks   \
-       -I$(top_srcdir)/src/sync        \
        -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
        -DLOCALEDIR=\"$(localedir)\"    \
        $(GIO_CFLAGS)                   \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a996062..3cd5ed7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -87,11 +87,11 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/embed           \
        -I$(top_srcdir)/lib             \
        -I$(top_srcdir)/lib/history     \
+       -I$(top_srcdir)/lib/sync        \
        -I$(top_srcdir)/lib/widgets     \
        -I$(top_builddir)/lib/widgets   \
        -I$(top_srcdir)/src             \
        -I$(top_srcdir)/src/bookmarks   \
-       -I$(top_srcdir)/src/sync        \
        -DTEST_DIR=\"$(srcdir)\"        \
        $(GDK_CFLAGS)                   \
        $(GLIB_CFLAGS)                  \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]