[epiphany] Move sync files to subdirectory
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Move sync files to subdirectory
- Date: Sat, 8 Oct 2016 20:19:02 +0000 (UTC)
commit 8b67eeac1733664b14926a1615263f4f565d0dc4
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sat Oct 8 15:18:22 2016 -0500
Move sync files to subdirectory
po/POTFILES.in | 4 ++--
src/Makefile.am | 18 ++++++++++--------
src/search-provider/Makefile.am | 1 +
src/{ => sync}/ephy-sync-crypto.c | 0
src/{ => sync}/ephy-sync-crypto.h | 0
src/{ => sync}/ephy-sync-secret.c | 0
src/{ => sync}/ephy-sync-secret.h | 0
src/{ => sync}/ephy-sync-service.c | 0
src/{ => sync}/ephy-sync-service.h | 0
src/{ => sync}/ephy-sync-utils.c | 0
src/{ => sync}/ephy-sync-utils.h | 0
tests/Makefile.am | 1 +
12 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9d89831..3d30d09 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -37,11 +37,11 @@ src/ephy-main.c
src/ephy-notebook.c
src/ephy-session.c
src/ephy-shell.c
-src/ephy-sync-secret.c
src/ephy-window.c
src/passwords-dialog.c
src/popup-commands.c
src/prefs-dialog.c
+src/profile-migrator/ephy-profile-migrator.c
src/resources/clear-data-dialog.ui
src/resources/cookies-dialog.ui
src/resources/encoding-dialog.ui
@@ -55,6 +55,6 @@ src/resources/passwords-dialog.ui
src/resources/prefs-dialog.ui
src/resources/prefs-lang-dialog.ui
src/resources/shortcuts-dialog.ui
-src/profile-migrator/ephy-profile-migrator.c
src/search-provider/ephy-search-provider.c
+src/sync/ephy-sync-secret.c
src/window-commands.c
diff --git a/src/Makefile.am b/src/Makefile.am
index a80858d..01a2027 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,14 +57,6 @@ libephymain_la_SOURCES = \
ephy-session.h \
ephy-shell.c \
ephy-shell.h \
- ephy-sync-crypto.c \
- ephy-sync-crypto.h \
- ephy-sync-secret.c \
- ephy-sync-secret.h \
- ephy-sync-service.c \
- ephy-sync-service.h \
- ephy-sync-utils.c \
- ephy-sync-utils.h \
ephy-window.c \
ephy-window.h \
languages.h \
@@ -74,6 +66,14 @@ libephymain_la_SOURCES = \
popup-commands.h \
prefs-dialog.c \
prefs-dialog.h \
+ sync/ephy-sync-crypto.c \
+ sync/ephy-sync-crypto.h \
+ sync/ephy-sync-secret.c \
+ sync/ephy-sync-secret.h \
+ sync/ephy-sync-service.c \
+ sync/ephy-sync-service.h \
+ sync/ephy-sync-utils.c \
+ sync/ephy-sync-utils.h \
window-commands.c \
window-commands.h
@@ -91,6 +91,7 @@ libephymain_la_CPPFLAGS = \
-I$(top_srcdir)/lib/history \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
+ -I$(top_srcdir)/src/sync \
-DLOCALEDIR=\"$(localedir)\" \
-DPKGDATADIR=\"$(pkgdatadir)\" \
$(GDK_CFLAGS) \
@@ -186,6 +187,7 @@ epiphany_CPPFLAGS = \
-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) \
diff --git a/src/search-provider/Makefile.am b/src/search-provider/Makefile.am
index 47bfb5d..ac499f4 100644
--- a/src/search-provider/Makefile.am
+++ b/src/search-provider/Makefile.am
@@ -24,6 +24,7 @@ epiphany_search_provider_CPPFLAGS = \
-I$(top_srcdir)/lib/history \
-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/src/ephy-sync-crypto.c b/src/sync/ephy-sync-crypto.c
similarity index 100%
rename from src/ephy-sync-crypto.c
rename to src/sync/ephy-sync-crypto.c
diff --git a/src/ephy-sync-crypto.h b/src/sync/ephy-sync-crypto.h
similarity index 100%
rename from src/ephy-sync-crypto.h
rename to src/sync/ephy-sync-crypto.h
diff --git a/src/ephy-sync-secret.c b/src/sync/ephy-sync-secret.c
similarity index 100%
rename from src/ephy-sync-secret.c
rename to src/sync/ephy-sync-secret.c
diff --git a/src/ephy-sync-secret.h b/src/sync/ephy-sync-secret.h
similarity index 100%
rename from src/ephy-sync-secret.h
rename to src/sync/ephy-sync-secret.h
diff --git a/src/ephy-sync-service.c b/src/sync/ephy-sync-service.c
similarity index 100%
rename from src/ephy-sync-service.c
rename to src/sync/ephy-sync-service.c
diff --git a/src/ephy-sync-service.h b/src/sync/ephy-sync-service.h
similarity index 100%
rename from src/ephy-sync-service.h
rename to src/sync/ephy-sync-service.h
diff --git a/src/ephy-sync-utils.c b/src/sync/ephy-sync-utils.c
similarity index 100%
rename from src/ephy-sync-utils.c
rename to src/sync/ephy-sync-utils.c
diff --git a/src/ephy-sync-utils.h b/src/sync/ephy-sync-utils.h
similarity index 100%
rename from src/ephy-sync-utils.h
rename to src/sync/ephy-sync-utils.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3e29c77..0b907eb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -95,6 +95,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/lib/widgets \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/bookmarks \
+ -I$(top_srcdir)/src/sync \
-DTEST_DIR=\"$(srcdir)\"
AM_CFLAGS = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]