update changelog
[platform/upstream/syncevolution.git] / Makefile.in
index 355aa56..6f6d750 100644 (file)
@@ -131,7 +131,6 @@ DIST_COMMON = README $(am__configure_deps) \
        $(top_srcdir)/build/build.am $(top_srcdir)/configure \
        $(top_srcdir)/setup-variables.am \
        $(top_srcdir)/src/backends/activesync/activesync.am \
-       $(top_srcdir)/src/backends/addressbook/addressbook.am \
        $(top_srcdir)/src/backends/akonadi/akonadi.am \
        $(top_srcdir)/src/backends/backends.am \
        $(top_srcdir)/src/backends/evolution/evolution.am \
@@ -141,6 +140,7 @@ DIST_COMMON = README $(am__configure_deps) \
        $(top_srcdir)/src/backends/kcalextended/kcalextended.am \
        $(top_srcdir)/src/backends/kde/kde.am \
        $(top_srcdir)/src/backends/maemo/maemo.am \
+       $(top_srcdir)/src/backends/oauth2/oauth2.am \
        $(top_srcdir)/src/backends/pbap/pbap.am \
        $(top_srcdir)/src/backends/qtcontacts/qtcontacts.am \
        $(top_srcdir)/src/backends/signon/accounts/google-caldav.service.in \
@@ -170,11 +170,10 @@ DIST_COMMON = README $(am__configure_deps) \
        $(top_srcdir)/src/testcases.am AUTHORS COPYING ChangeLog \
        INSTALL NEWS compile config.guess config.sub depcomp \
        install-sh ltmain.sh missing mkinstalldirs
-test_PROGRAMS = $(am__EXEEXT_10)
-bin_PROGRAMS = $(am__EXEEXT_4) $(am__append_79) $(am__append_83)
+test_PROGRAMS = $(am__EXEEXT_9)
+bin_PROGRAMS = $(am__EXEEXT_4) $(am__append_85) $(am__append_89)
 libexec_PROGRAMS = src/syncevo-local-sync$(EXEEXT) $(am__EXEEXT_5)
-noinst_PROGRAMS = $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \
-       $(am__EXEEXT_9)
+noinst_PROGRAMS = $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8)
 EXTRA_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
        src/abort-redirect$(EXEEXT)
 TESTS =
@@ -184,22 +183,20 @@ TESTS =
 @COND_GIO_GDBUS_TRUE@@ENABLE_MODULES_TRUE@am__append_4 = src/gdbusxx/libgdbussyncevo.la
 @COND_GIO_GDBUS_TRUE@@ENABLE_MODULES_FALSE@am__append_5 = src/gdbusxx/libgdbussyncevo.la
 @COND_GIO_GDBUS_TRUE@am__append_6 = Makefile.in
-@COND_GIO_GDBUS_TRUE@am__append_7 = src/gdbusxx/example
-@COND_GIO_GDBUS_TRUE@am__append_8 = -I$(top_srcdir)/src/gdbusxx
-@COND_GIO_GDBUS_FALSE@am__append_9 = \
+@COND_GIO_GDBUS_TRUE@am__append_7 = -I$(top_srcdir)/src/gdbusxx
+@COND_GIO_GDBUS_FALSE@am__append_8 = \
 @COND_GIO_GDBUS_FALSE@  src/gdbus/README
 
-@COND_GIO_GDBUS_FALSE@@ENABLE_MODULES_TRUE@am__append_10 = src/gdbus/libgdbussyncevo.la
-@COND_GIO_GDBUS_FALSE@@ENABLE_MODULES_FALSE@am__append_11 = src/gdbus/libgdbussyncevo.la
+@COND_GIO_GDBUS_FALSE@@ENABLE_MODULES_TRUE@am__append_9 = src/gdbus/libgdbussyncevo.la
+@COND_GIO_GDBUS_FALSE@@ENABLE_MODULES_FALSE@am__append_10 = src/gdbus/libgdbussyncevo.la
 
 # include_HEADERS = src/gdbus/gdbus-cxx-bridge.h src/gdbus/gdbus-cxx.h
-@COND_GIO_GDBUS_FALSE@am__append_12 = src/gdbus/example
-@COND_GIO_GDBUS_FALSE@am__append_13 = -I$(top_srcdir)/src/gdbus
-@COND_CORE_TRUE@am__append_14 = src/syncevo/configs/README \
+@COND_GIO_GDBUS_FALSE@am__append_11 = src/gdbus/example
+@COND_GIO_GDBUS_FALSE@am__append_12 = -I$(top_srcdir)/src/gdbus
+@COND_CORE_TRUE@am__append_13 = src/syncevo/configs/README \
 @COND_CORE_TRUE@       src/syncevo/syncevolution.pc.in \
 @COND_CORE_TRUE@       src/backends/activesync/configure-sub.in \
 @COND_CORE_TRUE@       src/backends/activesync/README \
-@COND_CORE_TRUE@       src/backends/addressbook/configure-sub.in \
 @COND_CORE_TRUE@       src/backends/akonadi/configure-sub.in \
 @COND_CORE_TRUE@       src/backends/akonadi/README \
 @COND_CORE_TRUE@       src/backends/evolution/configure-sub.in \
@@ -210,6 +207,8 @@ TESTS =
 @COND_CORE_TRUE@       src/backends/kcalextended/configure-sub.in \
 @COND_CORE_TRUE@       src/backends/kde/configure-sub.in \
 @COND_CORE_TRUE@       src/backends/maemo/configure-sub.in \
+@COND_CORE_TRUE@       src/backends/oauth2/configure-sub.in \
+@COND_CORE_TRUE@       src/backends/oauth2/README $(NONE) \
 @COND_CORE_TRUE@       src/backends/pbap/configure-sub.in \
 @COND_CORE_TRUE@       src/backends/pbap/README $(NONE) \
 @COND_CORE_TRUE@       src/backends/qtcontacts/configure-sub.in \
@@ -225,47 +224,57 @@ TESTS =
 @COND_CORE_TRUE@       src/backends/webdav/README \
 @COND_CORE_TRUE@       src/backends/xmlrpc/configure-sub.in \
 @COND_CORE_TRUE@       src/backends/xmlrpc/README
-@COND_CORE_TRUE@@ENABLE_UNIT_TESTS_TRUE@am__append_15 = $(CPPUNIT_CXXFLAGS)
-@COND_CORE_TRUE@@ENABLE_UNIT_TESTS_TRUE@am__append_16 = $(CPPUNIT_LDFLAGS)
-@COND_CORE_TRUE@am__append_17 = src/syncevo/libsyncevolution.la
+@COND_CORE_TRUE@@ENABLE_UNIT_TESTS_TRUE@am__append_14 = $(CPPUNIT_CXXFLAGS)
+@COND_CORE_TRUE@@ENABLE_UNIT_TESTS_TRUE@am__append_15 = $(CPPUNIT_LDFLAGS)
+@COND_CORE_TRUE@am__append_16 = src/syncevo/libsyncevolution.la
+
+# Only useful in combination with GDBus GIO.
+@COND_CORE_TRUE@@COND_GIO_GDBUS_TRUE@am__append_17 = \
+@COND_CORE_TRUE@@COND_GIO_GDBUS_TRUE@  src/syncevo/gsignond-pipe-stream.h \
+@COND_CORE_TRUE@@COND_GIO_GDBUS_TRUE@  src/syncevo/gsignond-pipe-stream.cpp
+
 @COND_CORE_TRUE@@ENABLE_ICAL_TRUE@am__append_18 = \
 @COND_CORE_TRUE@@ENABLE_ICAL_TRUE@  src/syncevo/icalstrdup.c \
 @COND_CORE_TRUE@@ENABLE_ICAL_TRUE@  src/syncevo/icalstrdup.h
 
-@COND_CORE_TRUE@@ENABLE_OBEX_TRUE@am__append_19 = \
+@COND_CORE_TRUE@@ENABLE_ICALTZ_UTIL_TRUE@am__append_19 = \
+@COND_CORE_TRUE@@ENABLE_ICALTZ_UTIL_TRUE@  src/syncevo/icaltz-util.c \
+@COND_CORE_TRUE@@ENABLE_ICALTZ_UTIL_TRUE@  src/syncevo/icaltz-util.h
+
+@COND_CORE_TRUE@@ENABLE_EVOLUTION_COMPATIBILITY_FALSE@@ENABLE_ICALTZ_UTIL_TRUE@am__append_20 = $(LIBICAL_LIBS)
+@COND_CORE_TRUE@@ENABLE_OBEX_TRUE@am__append_21 = \
 @COND_CORE_TRUE@@ENABLE_OBEX_TRUE@  src/syncevo/ObexTransportAgent.h \
 @COND_CORE_TRUE@@ENABLE_OBEX_TRUE@  src/syncevo/ObexTransportAgent.cpp
 
-@COND_CORE_TRUE@@ENABLE_OBEX_TRUE@am__append_20 = $(LIBOPENOBEX_LIBS)
-@COND_CORE_TRUE@@ENABLE_OBEX_TRUE@am__append_21 = $(LIBOPENOBEX_CFLAGS)
-@COND_CORE_TRUE@@ENABLE_BLUETOOTH_TRUE@@ENABLE_OBEX_TRUE@am__append_22 = $(BLUEZ_LIBS)
-@COND_CORE_TRUE@@ENABLE_BLUETOOTH_TRUE@@ENABLE_OBEX_TRUE@am__append_23 = $(BLUEZ_CFLAGS)
+@COND_CORE_TRUE@@ENABLE_OBEX_TRUE@am__append_22 = $(LIBOPENOBEX_LIBS)
+@COND_CORE_TRUE@@ENABLE_OBEX_TRUE@am__append_23 = $(LIBOPENOBEX_CFLAGS)
+@COND_CORE_TRUE@@ENABLE_BLUETOOTH_TRUE@@ENABLE_OBEX_TRUE@am__append_24 = $(BLUEZ_LIBS)
+@COND_CORE_TRUE@@ENABLE_BLUETOOTH_TRUE@@ENABLE_OBEX_TRUE@am__append_25 = $(BLUEZ_CFLAGS)
 
 #pkgconfigdir is defined in $(top_srcdir)/setup-variables.am
-@COND_CORE_TRUE@am__append_24 = src/syncevo/syncevolution.pc
-@COND_CORE_TRUE@am__append_25 = src/syncevo/syncevolution.pc
+@COND_CORE_TRUE@am__append_26 = src/syncevo/syncevolution.pc
+@COND_CORE_TRUE@am__append_27 = src/syncevo/syncevolution.pc
 
 # turn README.rst into a file with plain text strings for
 # "Synopsis" and "Usage"
-@COND_CORE_TRUE@am__append_26 = src/syncevo/SyncEvolutionXML.c \
+@COND_CORE_TRUE@am__append_28 = src/syncevo/SyncEvolutionXML.c \
 @COND_CORE_TRUE@       src/syncevo/CmdlineHelp.c \
-@COND_CORE_TRUE@       src/backends/webdav/syncevo-webdav-lookup
-@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__append_27 = -ldl
-@COND_CORE_TRUE@am__append_28 = src/syncevo/GenSyncEvolutionXML
-@COND_CORE_TRUE@am__append_29 = src/syncevo/CmdlineHelp.c
-@COND_CORE_TRUE@am__append_30 = src/syncevo/readme2c.pl \
+@COND_CORE_TRUE@       src/syncevo-webdav-lookup
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__append_29 = -ldl
+@COND_CORE_TRUE@am__append_30 = src/syncevo/GenSyncEvolutionXML
+@COND_CORE_TRUE@am__append_31 = src/syncevo/CmdlineHelp.c
+@COND_CORE_TRUE@am__append_32 = src/syncevo/readme2c.pl \
 @COND_CORE_TRUE@       src/syncevo/installcheck-local.sh \
 @COND_CORE_TRUE@       test/Algorithm/Diff.pm \
 @COND_CORE_TRUE@       test/syncevo-http-server.py \
 @COND_CORE_TRUE@       test/syncevo-phone-config.py \
 @COND_CORE_TRUE@       test/synccompare.pl test/log2html.py \
 @COND_CORE_TRUE@       test/run_src_client_test.sh
-@COND_CORE_TRUE@am__append_31 = src_syncevo_install_check_local
-@COND_CORE_TRUE@am__append_32 = -I$(top_srcdir)/src/syncevo \
+@COND_CORE_TRUE@am__append_33 = src_syncevo_install_check_local
+@COND_CORE_TRUE@am__append_34 = -I$(top_srcdir)/src/syncevo \
 @COND_CORE_TRUE@       $(addprefix -I$(top_srcdir)/,$(BACKENDS)) \
 @COND_CORE_TRUE@       -I$(SYNTHESIS_SUBDIR)
-@COND_CORE_TRUE@am__append_33 = $(src_backends_activesync_lib) \
-@COND_CORE_TRUE@       $(src_backends_addressbook_lib) \
+@COND_CORE_TRUE@am__append_35 = $(src_backends_activesync_lib) \
 @COND_CORE_TRUE@       $(src_backends_akonadi_lib) \
 @COND_CORE_TRUE@       $(src_backends_evolution_lib) \
 @COND_CORE_TRUE@       $(src_backends_file_lib) \
@@ -274,14 +283,14 @@ TESTS =
 @COND_CORE_TRUE@       $(src_backends_kcalextended_lib) \
 @COND_CORE_TRUE@       $(src_backends_kde_lib) \
 @COND_CORE_TRUE@       $(src_backends_maemo_lib) \
+@COND_CORE_TRUE@       $(src_backends_oauth2_libs) \
 @COND_CORE_TRUE@       $(src_backends_pbap_lib) \
 @COND_CORE_TRUE@       $(src_backends_qtcontacts_lib) \
 @COND_CORE_TRUE@       $(src_backends_signon_libs) \
 @COND_CORE_TRUE@       $(src_backends_sqlite_lib) \
 @COND_CORE_TRUE@       $(src_backends_webdav_lib) \
 @COND_CORE_TRUE@       $(src_backends_xmlrpc_lib)
-@COND_CORE_TRUE@@ENABLE_MODULES_FALSE@am__append_34 = $(src_backends_activesync_lib) \
-@COND_CORE_TRUE@@ENABLE_MODULES_FALSE@ $(src_backends_addressbook_lib) \
+@COND_CORE_TRUE@@ENABLE_MODULES_FALSE@am__append_36 = $(src_backends_activesync_lib) \
 @COND_CORE_TRUE@@ENABLE_MODULES_FALSE@ $(src_backends_akonadi_lib) \
 @COND_CORE_TRUE@@ENABLE_MODULES_FALSE@ $(src_backends_evolution_lib) \
 @COND_CORE_TRUE@@ENABLE_MODULES_FALSE@ $(src_backends_file_lib) \
@@ -290,73 +299,78 @@ TESTS =
 @COND_CORE_TRUE@@ENABLE_MODULES_FALSE@ $(src_backends_kcalextended_lib) \
 @COND_CORE_TRUE@@ENABLE_MODULES_FALSE@ $(src_backends_kde_lib) \
 @COND_CORE_TRUE@@ENABLE_MODULES_FALSE@ $(src_backends_maemo_lib) \
+@COND_CORE_TRUE@@ENABLE_MODULES_FALSE@ $(src_backends_oauth2_libs) \
 @COND_CORE_TRUE@@ENABLE_MODULES_FALSE@ $(src_backends_pbap_lib) \
 @COND_CORE_TRUE@@ENABLE_MODULES_FALSE@ $(src_backends_qtcontacts_lib) \
 @COND_CORE_TRUE@@ENABLE_MODULES_FALSE@ $(src_backends_signon_libs) \
 @COND_CORE_TRUE@@ENABLE_MODULES_FALSE@ $(src_backends_sqlite_lib) \
 @COND_CORE_TRUE@@ENABLE_MODULES_FALSE@ $(src_backends_webdav_lib) \
 @COND_CORE_TRUE@@ENABLE_MODULES_FALSE@ $(src_backends_xmlrpc_lib)
-@COND_CORE_TRUE@@ENABLE_ECAL_TRUE@am__append_35 = \
+@COND_CORE_TRUE@@ENABLE_ECAL_TRUE@am__append_37 = \
 @COND_CORE_TRUE@@ENABLE_ECAL_TRUE@  src/backends/evolution/e-cal-check-timezones.c \
 @COND_CORE_TRUE@@ENABLE_ECAL_TRUE@  src/backends/evolution/e-cal-check-timezones.h
 
-@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__append_36 = \
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__append_38 = \
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@  src/backends/gnome/GNOMEPlatformRegister.cpp
 
-@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__append_37 = \
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__append_39 = \
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@  src/backends/goa/GOARegister.cpp
 
-@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__append_38 = \
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__append_40 = \
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@  src/backends/kde/KDEPlatformRegister.cpp
 
-@COND_CORE_TRUE@@USE_GSSO_TRUE@am__append_39 = src/backends/signon/providergsso.la
-@COND_CORE_TRUE@@USE_UOA_TRUE@am__append_40 = src/backends/signon/provideruoa.la
-@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__append_41 = \
+@COND_CORE_TRUE@@USE_OAUTH2_TRUE@am__append_41 = src/backends/oauth2/provideroauth2.la
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__append_42 = \
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@  src/backends/oauth2/oauth2Register.cpp
+
+@COND_CORE_TRUE@@USE_GSSO_TRUE@am__append_43 = src/backends/signon/providergsso.la
+@COND_CORE_TRUE@@USE_UOA_TRUE@am__append_44 = src/backends/signon/provideruoa.la
+@COND_CORE_TRUE@@USE_SIGNON_TRUE@am__append_45 = src/backends/signon/providersignon.la
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__append_46 = \
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@  src/backends/signon/signonRegister.cpp
 
-@COND_CORE_TRUE@am__append_42 =  \
-@COND_CORE_TRUE@       src/backends/webdav/syncevo-webdav-lookup \
+@COND_CORE_TRUE@am__append_47 = src/syncevo-webdav-lookup \
 @COND_CORE_TRUE@       src/synccompare
-@COND_CORE_TRUE@@NEON_COMPATIBILITY_TRUE@am__append_43 = webdav_so_check
-@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__append_44 = $(DESTDIR)/$(src_backends_webdav_backenddir)/syncdav.so
-@COND_CORE_TRUE@am__append_45 = src/syncevolution
-@COND_CORE_FALSE@am__append_46 = -I$(top_srcdir)/$(SYNTHESIS_SUBDIR_INCLUDES)
-@COND_DOC_TRUE@am__append_47 = src/dbus/interfaces/syncevo-dbus-api-doc.html
-@COND_GUI_TRUE@am__append_48 = $(src_dbus_glib_lib)
-@COND_GUI_TRUE@am__append_49 = src/dbus/glib/syncevo-dbus.pc
-@COND_GUI_TRUE@am__append_50 = \
+@COND_CORE_TRUE@@NEON_COMPATIBILITY_TRUE@am__append_48 = webdav_so_check
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__append_49 = $(DESTDIR)/$(src_backends_webdav_backenddir)/syncdav.so
+@COND_CORE_TRUE@am__append_50 = src/syncevolution
+@COND_CORE_FALSE@am__append_51 = -I$(top_srcdir)/$(SYNTHESIS_SUBDIR_INCLUDES)
+@COND_DOC_TRUE@am__append_52 = src/dbus/interfaces/syncevo-dbus-api-doc.html
+@COND_GUI_TRUE@am__append_53 = $(src_dbus_glib_lib)
+@COND_GUI_TRUE@am__append_54 = src/dbus/glib/syncevo-dbus.pc
+@COND_GUI_TRUE@am__append_55 = \
 @COND_GUI_TRUE@  src/dbus/glib/syncevo-dbus.pc.in \
 @COND_GUI_TRUE@  src/dbus/glib/syncevo-marshal.list \
 @COND_GUI_TRUE@  src/dbus/glib/README
 
 
 #pkgconfigdir is defined in $(top_srcdir)/setup-variables.am
-@COND_GUI_TRUE@am__append_51 = src/dbus/glib/syncevo-dbus.pc
-@COND_GUI_TRUE@am__append_52 = src/dbus/glib/test-syncevo-dbus
-@COND_GUI_TRUE@am__append_53 = $(src_dbus_glib_built_sources)
-@COND_GUI_TRUE@am__append_54 = $(src_dbus_glib_built_sources)
-@ENABLE_QT_DBUS_TRUE@am__append_55 = $(src_dbus_qt_libsyncevolution_qt_dbus_libraries)
-@ENABLE_QT_DBUS_TRUE@am__append_56 = $(src_dbus_qt_built_sources)
-@ENABLE_QT_DBUS_TRUE@am__append_57 = $(src_dbus_qt_libsyncevolution_qt_dbus_libraries)
-@ENABLE_QT_DBUS_TRUE@am__append_58 = src/dbus/qt/Makefile.in
-@ENABLE_QT_DBUS_TRUE@am__append_59 = $(src_dbus_qt_built_sources) \
+@COND_GUI_TRUE@am__append_56 = src/dbus/glib/syncevo-dbus.pc
+@COND_GUI_TRUE@am__append_57 = src/dbus/glib/test-syncevo-dbus
+@COND_GUI_TRUE@am__append_58 = $(src_dbus_glib_built_sources)
+@COND_GUI_TRUE@am__append_59 = $(src_dbus_glib_built_sources)
+@ENABLE_QT_DBUS_TRUE@am__append_60 = $(src_dbus_qt_libsyncevolution_qt_dbus_libraries)
+@ENABLE_QT_DBUS_TRUE@am__append_61 = $(src_dbus_qt_built_sources)
+@ENABLE_QT_DBUS_TRUE@am__append_62 = $(src_dbus_qt_libsyncevolution_qt_dbus_libraries)
+@ENABLE_QT_DBUS_TRUE@am__append_63 = src/dbus/qt/Makefile.in
+@ENABLE_QT_DBUS_TRUE@am__append_64 = $(src_dbus_qt_built_sources) \
 @ENABLE_QT_DBUS_TRUE@  src/dbus/qt/stamp-server \
 @ENABLE_QT_DBUS_TRUE@  src/dbus/qt/stamp-session \
 @ENABLE_QT_DBUS_TRUE@  src/dbus/qt/stamp-connection
 
-@ENABLE_QT_DBUS_TRUE@am__append_60 = src/dbus/qt/syncevolution-qt-dbus.pc
-@ENABLE_QT_DBUS_TRUE@am__append_61 = \
+@ENABLE_QT_DBUS_TRUE@am__append_65 = src/dbus/qt/syncevolution-qt-dbus.pc
+@ENABLE_QT_DBUS_TRUE@am__append_66 = \
 @ENABLE_QT_DBUS_TRUE@  src/dbus/qt/syncevolution-qt-dbus.pc.in
 
 #pkgconfigdir is defined in $(top_srcdir)/setup-variables.am
-@ENABLE_QT_DBUS_TRUE@am__append_62 = src/dbus/qt/syncevolution-qt-dbus.pc
+@ENABLE_QT_DBUS_TRUE@am__append_67 = src/dbus/qt/syncevolution-qt-dbus.pc
 
 # Session helper: syncevo-dbus-helper 
-@COND_DBUS_TRUE@am__append_63 =  \
+@COND_DBUS_TRUE@am__append_68 =  \
 @COND_DBUS_TRUE@       src/dbus/server/libsyncevodbusserver.la \
 @COND_DBUS_TRUE@       src/dbus/server/libsyncevodbushelper.la
-@COND_DBUS_TRUE@am__append_64 = src/dbus/server/bluetooth_products.ini
-@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__append_65 = \
+@COND_DBUS_TRUE@am__append_69 = src/dbus/server/bluetooth_products.ini
+@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__append_70 = \
 @COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@  src/dbus/server/pim/view.cpp \
 @COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@  src/dbus/server/pim/full-view.cpp \
 @COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@  src/dbus/server/pim/filtered-view.cpp \
@@ -367,42 +381,47 @@ TESTS =
 @COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@  src/dbus/server/pim/folks.cpp \
 @COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@  src/dbus/server/pim/manager.cpp
 
-@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__append_66 = \
+@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__append_71 = \
 @COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@  src/dbus/server/pim/persona-details.h
 
-@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__append_67 = \
+@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__append_72 = \
 @COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@  src/dbus/server/pim/locale-factory-@DBUS_PIM_PLUGIN@.cpp
 
-@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__append_68 = $(DBUS_PIM_PLUGIN_LDFLAGS)
-@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__append_69 = $(FOLKS_LIBS) $(DBUS_PIM_PLUGIN_LIBS) $(PHONENUMBERS_LIBS)
-@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__append_70 = $(FOLKS_CFLAGS) $(DBUS_PIM_PLUGIN_CFLAGS) $(PHONENUMBERS_CFLAGS) $(DLT_CFLAGS)
+@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__append_73 = $(DBUS_PIM_PLUGIN_LDFLAGS)
+@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__append_74 = $(FOLKS_LIBS) $(DBUS_PIM_PLUGIN_LIBS) $(PHONENUMBERS_LIBS)
+@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__append_75 = $(FOLKS_CFLAGS) $(DBUS_PIM_PLUGIN_CFLAGS) $(PHONENUMBERS_CFLAGS) $(DLT_CFLAGS)
 
 # Need to list all plugins here and not include the active one in the regular
 # source list above, because "make dist" would only include the configured one.
-@COND_DBUS_TRUE@am__append_71 = \
+@COND_DBUS_TRUE@am__append_76 = \
 @COND_DBUS_TRUE@  src/dbus/server/pim/locale-factory-boost.cpp
 
 
 # Deal with .service, .desktop and startup script files.
-@COND_DBUS_TRUE@am__append_72 = \
+@COND_DBUS_TRUE@am__append_77 = \
 @COND_DBUS_TRUE@  $(src_dbus_server_service_files) \
 @COND_DBUS_TRUE@  $(src_dbus_server_desktop) \
 @COND_DBUS_TRUE@  $(src_dbus_server_script)
 
-@COND_DBUS_TRUE@am__append_73 = $(src_dbus_server_script)
-@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__append_74 = \
+@COND_DBUS_TRUE@am__append_78 = $(src_dbus_server_script)
+@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__append_79 = \
 @COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@  src/dbus/server/pim/org._01.pim.contacts.service.in
 
-@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@@ENABLE_TESTING_TRUE@am__append_75 = \
+@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__append_80 = \
+@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@   src/dbus/server/pim/examples/search.py \
+@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@   src/dbus/server/pim/examples/sync.py \
+@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@   $(NOP)
+
+@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@@ENABLE_TESTING_TRUE@am__append_81 = \
 @COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@@ENABLE_TESTING_TRUE@      src/dbus/server/pim/testpim.py \
 @COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@@ENABLE_TESTING_TRUE@      $(NOP)
 
-@COND_DBUS_TRUE@am__append_76 = \
+@COND_DBUS_TRUE@am__append_82 = \
 @COND_DBUS_TRUE@  $(src_dbus_server_service_files_in) \
 @COND_DBUS_TRUE@  $(src_dbus_server_script_in) \
 @COND_DBUS_TRUE@  $(src_dbus_server_desktop_in)
 
-@COND_GTK2_TRUE@@COND_GUI_TRUE@am__append_77 = src/gtk-ui/README \
+@COND_GTK2_TRUE@@COND_GUI_TRUE@am__append_83 = src/gtk-ui/README \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@        $(src_gtk_ui_applications_in_files)
 
 # sync-ui: default GUI, could be plain GTK or Moblin UX
@@ -410,17 +429,17 @@ TESTS =
 # sync-ui-moblin: Moblin UX
 #
 # The later two are built when --enable-gui=all was used.
-@COND_GTK2_TRUE@@COND_GUI_TRUE@am__append_78 = \
+@COND_GTK2_TRUE@@COND_GUI_TRUE@am__append_84 = \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@  src/gtk-ui/sync-ui \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@  src/gtk-ui/sync-ui-gtk \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@  src/gtk-ui/sync-ui-moblin
 
-@COND_GTK2_TRUE@@COND_GUI_TRUE@am__append_79 = @GUI_PROGRAMS@
-@COND_GTK2_TRUE@@COND_GUI_TRUE@am__append_80 = \
+@COND_GTK2_TRUE@@COND_GUI_TRUE@am__append_85 = @GUI_PROGRAMS@
+@COND_GTK2_TRUE@@COND_GUI_TRUE@am__append_86 = \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@  src/gtk-ui/sync-moblin.desktop \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@  $(src_gtk_ui_applications_generated)
 
-@COND_GTK2_FALSE@@COND_GUI_TRUE@am__append_81 = src/gtk3-ui/README \
+@COND_GTK2_FALSE@@COND_GUI_TRUE@am__append_87 = src/gtk3-ui/README \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@       $(src_gtk3_ui_applications_in_files)
 
 # sync-ui: default GUI, could be plain GTK or Moblin UX
@@ -428,20 +447,20 @@ TESTS =
 # sync-ui-moblin: Moblin UX
 #
 # The later two are built when --enable-gui=all was used.
-@COND_GTK2_FALSE@@COND_GUI_TRUE@am__append_82 = \
+@COND_GTK2_FALSE@@COND_GUI_TRUE@am__append_88 = \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@  src/gtk3-ui/sync-ui \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@  src/gtk3-ui/sync-ui-gtk \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@  src/gtk3-ui/sync-ui-moblin
 
-@COND_GTK2_FALSE@@COND_GUI_TRUE@am__append_83 = @GUI_PROGRAMS@
-@COND_GTK2_FALSE@@COND_GUI_TRUE@am__append_84 = \
+@COND_GTK2_FALSE@@COND_GUI_TRUE@am__append_89 = @GUI_PROGRAMS@
+@COND_GTK2_FALSE@@COND_GUI_TRUE@am__append_90 = \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@  src/gtk3-ui/sync-moblin.desktop \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@  $(src_gtk3_ui_applications_generated)
 
-@COND_DBUS_TRUE@am__append_85 = src/syncevo-http-server
+@COND_DBUS_TRUE@am__append_91 = src/syncevo-http-server
 # SYNCEVOLUTION_LDADD is defined in configure script.
-@ENABLE_MODULES_FALSE@am__append_86 = @SYNCSOURCES@
-@ENABLE_MODULES_FALSE@am__append_87 = @SYNCSOURCES@
+@ENABLE_MODULES_FALSE@am__append_92 = @SYNCSOURCES@
+@ENABLE_MODULES_FALSE@am__append_93 = @SYNCSOURCES@
 
 # The files which register backends have to be compiled into
 # "client-test" and "syncevolution" in order to pull in the
@@ -452,56 +471,48 @@ TESTS =
 # When using modules the registration is done inside the
 # module and the register file is unnecessary. However, they
 # still need to be included in "make dist".
-@ENABLE_MODULES_TRUE@am__append_88 = $(BACKEND_REGISTRIES)
-@ENABLE_MODULES_FALSE@am__append_89 = $(BACKEND_REGISTRIES)
-@COND_DBUS_TRUE@am__append_90 = $(gdbus_build_dir)/libgdbussyncevo.la
-@COND_DBUS_TRUE@am__append_91 = $(gdbus_build_dir)/libgdbussyncevo.la
+@ENABLE_MODULES_TRUE@am__append_94 = $(BACKEND_REGISTRIES)
+@ENABLE_MODULES_FALSE@am__append_95 = $(BACKEND_REGISTRIES)
+
+# Force inclusion of our own icaltz-util.o into binaries even though
+# we do not call the icaltzutil_fetch_timezone directly ourself.
+# That way it is there if or when libical needs it.
+@ENABLE_ICALTZ_UTIL_TRUE@am__append_96 = -Wl,-usyncevo_fetch_timezone
+@COND_DBUS_TRUE@am__append_97 = $(gdbus_build_dir)/libgdbussyncevo.la
+@COND_DBUS_TRUE@am__append_98 = $(gdbus_build_dir)/libgdbussyncevo.la
 
 # Do the linking here, as with all SyncEvolution executables.
 # Sources are compiled in dbus/server.
 # DBus Server
 
 # syncevo-dbus-server's helper binary
-@COND_DBUS_TRUE@am__append_92 = src/syncevo-dbus-server \
+@COND_DBUS_TRUE@am__append_99 = src/syncevo-dbus-server \
 @COND_DBUS_TRUE@       src/syncevo-dbus-helper
-@COND_DBUS_TRUE@am__append_93 = src/dbus/server/libsyncevodbushelper.la src/dbus/server/libsyncevodbusserver.la
+@COND_DBUS_TRUE@am__append_100 = src/dbus/server/libsyncevodbushelper.la src/dbus/server/libsyncevodbusserver.la
+@ENABLE_EVOLUTION_COMPATIBILITY_FALSE@am__append_101 = $(LIBICAL_LIBS)
 
 # distribute test system?
 # yes: install client-test and test files in testdir
-@ENABLE_TESTING_TRUE@am__append_94 = src/client-test
+@ENABLE_TESTING_TRUE@am__append_102 = src/client-test
 # The "all" dependency causes a rebuild even if the actual input files
 # haven't changed. If client-test is part of the regular targets built
 # by "all", then it must not depend on all!
-@ENABLE_TESTING_FALSE@am__append_95 = src/client-test
-@ENABLE_TESTING_FALSE@am__append_96 = $(CLIENT_LIB_TEST_FILES)
-@ENABLE_TESTING_FALSE@am__append_97 = all
-@COND_CORE_TRUE@am__append_98 = test/abort-redirect.cpp \
+@ENABLE_TESTING_FALSE@am__append_103 = src/client-test
+@ENABLE_TESTING_FALSE@am__append_104 = $(CLIENT_LIB_TEST_FILES)
+@ENABLE_TESTING_FALSE@am__append_105 = all
+@COND_CORE_TRUE@am__append_106 = test/abort-redirect.cpp \
 @COND_CORE_TRUE@       test/ClientTest.h test/ClientTestAssert.h \
 @COND_CORE_TRUE@       test/ClientTest.cpp test/client-test-main.cpp \
-@COND_CORE_TRUE@       test/test.h test/test.cpp test/COPYING \
-@COND_CORE_TRUE@       test/Algorithm/Artistic test/Algorithm/COPYING \
-@COND_CORE_TRUE@       test/Algorithm/README \
-@COND_CORE_TRUE@       test/testcases/eds_event.ics \
-@COND_CORE_TRUE@       test/testcases/eds_event.ics.local \
-@COND_CORE_TRUE@       test/testcases/eds_task.ics \
-@COND_CORE_TRUE@       test/testcases/vcal10.ics \
-@COND_CORE_TRUE@       test/testcases/eds_contact.vcf \
-@COND_CORE_TRUE@       test/testcases/eds_contact.vcf \
-@COND_CORE_TRUE@       test/testcases/eds_memo.ics \
-@COND_CORE_TRUE@       test/testcases/google_event.ics \
-@COND_CORE_TRUE@       test/testcases/yahoo_contact.vcf \
-@COND_CORE_TRUE@       test/testcases/lcs/file1.txt \
-@COND_CORE_TRUE@       test/testcases/lcs/file2.txt \
-@COND_CORE_TRUE@       test/testcases/local.png \
-@COND_CORE_TRUE@       test/testcases/templates/clients/phone/nokia/S40/7210c.ini \
-@COND_CORE_TRUE@       test/testcases/templates/clients/SyncEvolution.ini \
+@COND_CORE_TRUE@       test/test.h test/test.cpp $(test_testcases) \
+@COND_CORE_TRUE@       test/COPYING test/Algorithm/Artistic \
+@COND_CORE_TRUE@       test/Algorithm/COPYING test/Algorithm/README \
 @COND_CORE_TRUE@       test/syncevo-http-server-logging.conf \
 @COND_CORE_TRUE@       $(wildcard test/testcases/*.patch)
 
 # generic D-Bus client/server tests
-@COND_CORE_TRUE@@COND_DBUS_TRUE@am__append_99 = test/dbus-client-server
-@COND_CORE_TRUE@@COND_DBUS_TRUE@@ENABLE_UNIT_TESTS_TRUE@am__append_100 = test/test.cpp
-@COND_CORE_TRUE@@ENABLE_TESTING_TRUE@am__append_101 = \
+@COND_CORE_TRUE@@COND_DBUS_TRUE@am__append_107 = test/dbus-client-server
+@COND_CORE_TRUE@@COND_DBUS_TRUE@@ENABLE_UNIT_TESTS_TRUE@am__append_108 = test/test.cpp
+@COND_CORE_TRUE@@ENABLE_TESTING_TRUE@am__append_109 = \
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  test/__init__.py \
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  test/test-dbus.py \
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  test/testdbus.py \
@@ -512,13 +523,14 @@ TESTS =
 # uses the right SyncEvolution without depending on the PATH.
 # client-test should have been installed in testdir already as
 # normal executable, see src.am.
-@COND_CORE_TRUE@@ENABLE_TESTING_TRUE@am__append_102 = install-test-files
-@COND_CORE_TRUE@@ENABLE_TESTING_TRUE@am__append_103 = uninstall-test-files
-@COND_CORE_TRUE@@ENABLE_TESTING_TRUE@am__append_104 = \
+@COND_CORE_TRUE@@ENABLE_TESTING_TRUE@am__append_110 = install-test-files
+@COND_CORE_TRUE@@ENABLE_TESTING_TRUE@am__append_111 = uninstall-test-files
+@COND_CORE_TRUE@@ENABLE_TESTING_TRUE@am__append_112 = \
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  test/Makefile \
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  $(NOP)
 
-@COND_CORE_TRUE@@ENABLE_TESTING_TRUE@am__append_105 = \
+@COND_CORE_TRUE@@ENABLE_TESTING_TRUE@am__append_113 = \
+@COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  $(test_testcases) \
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  test/test-dbus/templates/templates/clients/phone/nokia/S40/7210c.ini \
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  test/test-dbus/templates/templates/clients/SyncEvolution.ini \
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  test/test-dbus/auto-sync/config/syncevolution/.internal.ini \
@@ -564,29 +576,29 @@ TESTS =
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  test/test-dbus/reports/cache/syncevolution/dummy__test-2009-11-18-12-56/status.ini \
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  $(NOP)
 
-@COND_CORE_TRUE@am__append_106 = po
-@COND_CORE_TRUE@am__append_107 = README NEWS COPYING $(TEST_README_FILES) test/syncevo-http-server-logging.conf
-@COND_CORE_TRUE@am__append_108 = $(disted_docs)
-@COND_CORE_TRUE@am__append_109 = $(disted_docs)
-@COND_CORE_TRUE@@COND_HTML_README_TRUE@am__append_110 = README.html
+@COND_CORE_TRUE@am__append_114 = po
+@COND_CORE_TRUE@am__append_115 = README NEWS COPYING $(TEST_README_FILES) test/syncevo-http-server-logging.conf
+@COND_CORE_TRUE@am__append_116 = $(disted_docs)
+@COND_CORE_TRUE@am__append_117 = $(disted_docs)
+@COND_CORE_TRUE@@COND_HTML_README_TRUE@am__append_118 = README.html
 # do not distribute in tarball.
-@COND_CORE_TRUE@@COND_HTML_README_TRUE@am__append_111 = README.html
-@COND_CORE_TRUE@@COND_MAN_PAGES_TRUE@am__append_112 = syncevolution.1
+@COND_CORE_TRUE@@COND_HTML_README_TRUE@am__append_119 = README.html
+@COND_CORE_TRUE@@COND_MAN_PAGES_TRUE@am__append_120 = syncevolution.1
 
 # check .so (relevant for modular builds) and main syncevolution binary
 # (relevant in that case and for static builds) for dependencies on
 # problematic libraries and symbols
 #
-# Exclude *-2.so, these are EXTRA_BACKENDS for which other rules apply.
+# Exclude *-[0-9].so, these are EXTRA_BACKENDS for which other rules apply.
 #
 # ical_strdup is an exception because it is in SyncEvolution.
-@ENABLE_EVOLUTION_COMPATIBILITY_TRUE@am__append_113 = toplevel_so_check
+@ENABLE_EVOLUTION_COMPATIBILITY_TRUE@am__append_121 = toplevel_so_check
 # libneon is intentionally not linked against, to choose between
 # GNUTLS and OpenSSL at runtime.
 # Allow undefined references to libstdcxx. This happens when
 # adding backends compiled on more recent Linux distros into
 # the release archive.
-@NEON_COMPATIBILITY_TRUE@am__append_114 = -e 'symbol ne_.*syncdav.so' \
+@NEON_COMPATIBILITY_TRUE@am__append_122 = -e 'symbol ne_.*syncdav.so' \
 @NEON_COMPATIBILITY_TRUE@      -e '@GLIBCXX_[^ ]* used by'
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -641,7 +653,6 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(libdir)" \
        "$(DESTDIR)$(src_backends_activesync_backenddir)" \
-       "$(DESTDIR)$(src_backends_addressbook_backenddir)" \
        "$(DESTDIR)$(src_backends_akonadi_backenddir)" \
        "$(DESTDIR)$(src_backends_evolution_backenddir)" \
        "$(DESTDIR)$(src_backends_file_backenddir)" \
@@ -650,6 +661,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
        "$(DESTDIR)$(src_backends_kcalextended_backenddir)" \
        "$(DESTDIR)$(src_backends_kde_backenddir)" \
        "$(DESTDIR)$(src_backends_maemo_backenddir)" \
+       "$(DESTDIR)$(src_backends_oauth2_backenddir)" \
        "$(DESTDIR)$(src_backends_pbap_backenddir)" \
        "$(DESTDIR)$(src_backends_qtcontacts_backenddir)" \
        "$(DESTDIR)$(src_backends_signon_backenddir)" \
@@ -706,7 +718,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
        "$(DESTDIR)$(src_syncevo_libsyncevolution_includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
        $(src_backends_activesync_backend_LTLIBRARIES) \
-       $(src_backends_addressbook_backend_LTLIBRARIES) \
        $(src_backends_akonadi_backend_LTLIBRARIES) \
        $(src_backends_evolution_backend_LTLIBRARIES) \
        $(src_backends_file_backend_LTLIBRARIES) \
@@ -715,6 +726,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
        $(src_backends_kcalextended_backend_LTLIBRARIES) \
        $(src_backends_kde_backend_LTLIBRARIES) \
        $(src_backends_maemo_backend_LTLIBRARIES) \
+       $(src_backends_oauth2_backend_LTLIBRARIES) \
        $(src_backends_pbap_backend_LTLIBRARIES) \
        $(src_backends_qtcontacts_backend_LTLIBRARIES) \
        $(src_backends_signon_backend_LTLIBRARIES) \
@@ -748,27 +760,6 @@ src_backends_activesync_syncactivesync_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am_src_backends_activesync_syncactivesync_la_rpath =  \
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@  -rpath \
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@  $(src_backends_activesync_backenddir)
-am__src_backends_addressbook_syncaddressbook_la_SOURCES_DIST =  \
-       src/backends/addressbook/AddressBookSource.h \
-       src/backends/addressbook/AddressBookConstants.cpp \
-       src/backends/addressbook/AddressBookSource.cpp
-@COND_CORE_TRUE@am__objects_2 = src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookConstants.lo \
-@COND_CORE_TRUE@       src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookSource.lo
-@COND_CORE_TRUE@am_src_backends_addressbook_syncaddressbook_la_OBJECTS =  \
-@COND_CORE_TRUE@       $(am__objects_2)
-src_backends_addressbook_syncaddressbook_la_OBJECTS =  \
-       $(am_src_backends_addressbook_syncaddressbook_la_OBJECTS)
-src_backends_addressbook_syncaddressbook_la_LINK = $(LIBTOOL) \
-       $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=link $(CXXLD) \
-       $(src_backends_addressbook_syncaddressbook_la_CXXFLAGS) \
-       $(CXXFLAGS) \
-       $(src_backends_addressbook_syncaddressbook_la_LDFLAGS) \
-       $(LDFLAGS) -o $@
-@COND_CORE_TRUE@@ENABLE_MODULES_FALSE@am_src_backends_addressbook_syncaddressbook_la_rpath =
-@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am_src_backends_addressbook_syncaddressbook_la_rpath =  \
-@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@  -rpath \
-@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@  $(src_backends_addressbook_backenddir)
 am__src_backends_akonadi_syncakonadi_la_SOURCES_DIST =  \
        src/backends/akonadi/akonadisyncsource.h \
        src/backends/akonadi/akonadisyncsource.cpp
@@ -789,10 +780,10 @@ am__src_backends_evolution_syncebook_la_SOURCES_DIST =  \
        src/backends/evolution/EvolutionSyncSource.cpp \
        src/backends/evolution/EvolutionContactSource.h \
        src/backends/evolution/EvolutionContactSource.cpp
-@COND_CORE_TRUE@am__objects_3 = src/backends/evolution/src_backends_evolution_syncebook_la-EvolutionSyncSource.lo \
+@COND_CORE_TRUE@am__objects_2 = src/backends/evolution/src_backends_evolution_syncebook_la-EvolutionSyncSource.lo \
 @COND_CORE_TRUE@       src/backends/evolution/src_backends_evolution_syncebook_la-EvolutionContactSource.lo
 @COND_CORE_TRUE@am_src_backends_evolution_syncebook_la_OBJECTS =  \
-@COND_CORE_TRUE@       $(am__objects_3)
+@COND_CORE_TRUE@       $(am__objects_2)
 src_backends_evolution_syncebook_la_OBJECTS =  \
        $(am_src_backends_evolution_syncebook_la_OBJECTS)
 src_backends_evolution_syncebook_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -810,16 +801,14 @@ am__src_backends_evolution_syncecal_la_SOURCES_DIST =  \
        src/backends/evolution/EvolutionCalendarSource.h \
        src/backends/evolution/EvolutionMemoSource.h \
        src/backends/evolution/EvolutionCalendarSource.cpp \
-       src/backends/evolution/EvolutionMemoSource.cpp \
        src/backends/evolution/e-cal-check-timezones.c \
        src/backends/evolution/e-cal-check-timezones.h
-@COND_CORE_TRUE@@ENABLE_ECAL_TRUE@am__objects_4 = src/backends/evolution/src_backends_evolution_syncecal_la-e-cal-check-timezones.lo
-@COND_CORE_TRUE@am__objects_5 = src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionSyncSource.lo \
+@COND_CORE_TRUE@@ENABLE_ECAL_TRUE@am__objects_3 = src/backends/evolution/src_backends_evolution_syncecal_la-e-cal-check-timezones.lo
+@COND_CORE_TRUE@am__objects_4 = src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionSyncSource.lo \
 @COND_CORE_TRUE@       src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionCalendarSource.lo \
-@COND_CORE_TRUE@       src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionMemoSource.lo \
-@COND_CORE_TRUE@       $(am__objects_4)
+@COND_CORE_TRUE@       $(am__objects_3)
 @COND_CORE_TRUE@am_src_backends_evolution_syncecal_la_OBJECTS =  \
-@COND_CORE_TRUE@       $(am__objects_5)
+@COND_CORE_TRUE@       $(am__objects_4)
 src_backends_evolution_syncecal_la_OBJECTS =  \
        $(am_src_backends_evolution_syncecal_la_OBJECTS)
 src_backends_evolution_syncecal_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -834,9 +823,9 @@ src_backends_evolution_syncecal_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 am__src_backends_file_syncfile_la_SOURCES_DIST =  \
        src/backends/file/FileSyncSource.h \
        src/backends/file/FileSyncSource.cpp
-@COND_CORE_TRUE@am__objects_6 = src/backends/file/src_backends_file_syncfile_la-FileSyncSource.lo
+@COND_CORE_TRUE@am__objects_5 = src/backends/file/src_backends_file_syncfile_la-FileSyncSource.lo
 @COND_CORE_TRUE@am_src_backends_file_syncfile_la_OBJECTS =  \
-@COND_CORE_TRUE@       $(am__objects_6)
+@COND_CORE_TRUE@       $(am__objects_5)
 src_backends_file_syncfile_la_OBJECTS =  \
        $(am_src_backends_file_syncfile_la_OBJECTS)
 src_backends_file_syncfile_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
@@ -851,9 +840,9 @@ am__src_backends_gnome_platformgnome_la_SOURCES_DIST =  \
        src/backends/gnome/GNOMEPlatform.h \
        src/backends/gnome/GNOMEPlatform.cpp \
        src/backends/gnome/GNOMEPlatformRegister.cpp
-@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__objects_7 = src/backends/gnome/src_backends_gnome_platformgnome_la-GNOMEPlatformRegister.lo
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__objects_6 = src/backends/gnome/src_backends_gnome_platformgnome_la-GNOMEPlatformRegister.lo
 @COND_CORE_TRUE@am_src_backends_gnome_platformgnome_la_OBJECTS = src/backends/gnome/src_backends_gnome_platformgnome_la-GNOMEPlatform.lo \
-@COND_CORE_TRUE@       $(am__objects_7)
+@COND_CORE_TRUE@       $(am__objects_6)
 src_backends_gnome_platformgnome_la_OBJECTS =  \
        $(am_src_backends_gnome_platformgnome_la_OBJECTS)
 src_backends_gnome_platformgnome_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -868,9 +857,9 @@ src_backends_gnome_platformgnome_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 am__src_backends_goa_providergoa_la_SOURCES_DIST =  \
        src/backends/goa/goa.h src/backends/goa/goa.cpp \
        src/backends/goa/GOARegister.cpp
-@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__objects_8 = src/backends/goa/src_backends_goa_providergoa_la-GOARegister.lo
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__objects_7 = src/backends/goa/src_backends_goa_providergoa_la-GOARegister.lo
 @COND_CORE_TRUE@am_src_backends_goa_providergoa_la_OBJECTS = src/backends/goa/src_backends_goa_providergoa_la-goa.lo \
-@COND_CORE_TRUE@       $(am__objects_8)
+@COND_CORE_TRUE@       $(am__objects_7)
 src_backends_goa_providergoa_la_OBJECTS =  \
        $(am_src_backends_goa_providergoa_la_OBJECTS)
 src_backends_goa_providergoa_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
@@ -902,9 +891,9 @@ am__src_backends_kde_platformkde_la_SOURCES_DIST =  \
        src/backends/kde/KDEPlatform.h \
        src/backends/kde/KDEPlatform.cpp \
        src/backends/kde/KDEPlatformRegister.cpp
-@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__objects_9 = src/backends/kde/src_backends_kde_platformkde_la-KDEPlatformRegister.lo
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__objects_8 = src/backends/kde/src_backends_kde_platformkde_la-KDEPlatformRegister.lo
 @COND_CORE_TRUE@am_src_backends_kde_platformkde_la_OBJECTS = src/backends/kde/src_backends_kde_platformkde_la-KDEPlatform.lo \
-@COND_CORE_TRUE@       $(am__objects_9)
+@COND_CORE_TRUE@       $(am__objects_8)
 src_backends_kde_platformkde_la_OBJECTS =  \
        $(am_src_backends_kde_platformkde_la_OBJECTS)
 src_backends_kde_platformkde_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
@@ -918,9 +907,9 @@ src_backends_kde_platformkde_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 am__src_backends_maemo_syncmaemocal_la_SOURCES_DIST =  \
        src/backends/maemo/MaemoCalendarSource.h \
        src/backends/maemo/MaemoCalendarSource.cpp
-@COND_CORE_TRUE@am__objects_10 = src/backends/maemo/src_backends_maemo_syncmaemocal_la-MaemoCalendarSource.lo
+@COND_CORE_TRUE@am__objects_9 = src/backends/maemo/src_backends_maemo_syncmaemocal_la-MaemoCalendarSource.lo
 @COND_CORE_TRUE@am_src_backends_maemo_syncmaemocal_la_OBJECTS =  \
-@COND_CORE_TRUE@       $(am__objects_10)
+@COND_CORE_TRUE@       $(am__objects_9)
 src_backends_maemo_syncmaemocal_la_OBJECTS =  \
        $(am_src_backends_maemo_syncmaemocal_la_OBJECTS)
 src_backends_maemo_syncmaemocal_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -932,12 +921,31 @@ src_backends_maemo_syncmaemocal_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am_src_backends_maemo_syncmaemocal_la_rpath =  \
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@  -rpath \
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@  $(src_backends_maemo_backenddir)
+am__src_backends_oauth2_provideroauth2_la_SOURCES_DIST =  \
+       src/backends/oauth2/oauth2.h src/backends/oauth2/oauth2.cpp \
+       src/backends/oauth2/oauth2Register.cpp
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__objects_10 = src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2Register.lo
+@COND_CORE_TRUE@am__objects_11 = src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2.lo \
+@COND_CORE_TRUE@       $(am__objects_10)
+@COND_CORE_TRUE@am_src_backends_oauth2_provideroauth2_la_OBJECTS =  \
+@COND_CORE_TRUE@       $(am__objects_11)
+src_backends_oauth2_provideroauth2_la_OBJECTS =  \
+       $(am_src_backends_oauth2_provideroauth2_la_OBJECTS)
+src_backends_oauth2_provideroauth2_la_LINK = $(LIBTOOL) $(AM_V_lt) \
+       --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+       $(CXXLD) $(src_backends_oauth2_provideroauth2_la_CXXFLAGS) \
+       $(CXXFLAGS) $(src_backends_oauth2_provideroauth2_la_LDFLAGS) \
+       $(LDFLAGS) -o $@
+@COND_CORE_TRUE@@ENABLE_MODULES_FALSE@@USE_OAUTH2_TRUE@am_src_backends_oauth2_provideroauth2_la_rpath =
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@@USE_OAUTH2_TRUE@am_src_backends_oauth2_provideroauth2_la_rpath =  \
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@@USE_OAUTH2_TRUE@ -rpath \
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@@USE_OAUTH2_TRUE@ $(src_backends_oauth2_backenddir)
 am__src_backends_pbap_syncpbap_la_SOURCES_DIST =  \
        src/backends/pbap/PbapSyncSource.h \
        src/backends/pbap/PbapSyncSource.cpp
-@COND_CORE_TRUE@am__objects_11 = src/backends/pbap/src_backends_pbap_syncpbap_la-PbapSyncSource.lo
+@COND_CORE_TRUE@am__objects_12 = src/backends/pbap/src_backends_pbap_syncpbap_la-PbapSyncSource.lo
 @COND_CORE_TRUE@am_src_backends_pbap_syncpbap_la_OBJECTS =  \
-@COND_CORE_TRUE@       $(am__objects_11)
+@COND_CORE_TRUE@       $(am__objects_12)
 src_backends_pbap_syncpbap_la_OBJECTS =  \
        $(am_src_backends_pbap_syncpbap_la_OBJECTS)
 src_backends_pbap_syncpbap_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
@@ -968,11 +976,11 @@ src_backends_qtcontacts_syncqtcontacts_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 am__src_backends_signon_providergsso_la_SOURCES_DIST =  \
        src/backends/signon/signon.h src/backends/signon/signon.cpp \
        src/backends/signon/signonRegister.cpp
-@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__objects_12 = src/backends/signon/src_backends_signon_providergsso_la-signonRegister.lo
-@COND_CORE_TRUE@am__objects_13 = src/backends/signon/src_backends_signon_providergsso_la-signon.lo \
-@COND_CORE_TRUE@       $(am__objects_12)
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__objects_13 = src/backends/signon/src_backends_signon_providergsso_la-signonRegister.lo
+@COND_CORE_TRUE@am__objects_14 = src/backends/signon/src_backends_signon_providergsso_la-signon.lo \
+@COND_CORE_TRUE@       $(am__objects_13)
 @COND_CORE_TRUE@@USE_GSSO_TRUE@am_src_backends_signon_providergsso_la_OBJECTS =  \
-@COND_CORE_TRUE@@USE_GSSO_TRUE@        $(am__objects_13)
+@COND_CORE_TRUE@@USE_GSSO_TRUE@        $(am__objects_14)
 src_backends_signon_providergsso_la_OBJECTS =  \
        $(am_src_backends_signon_providergsso_la_OBJECTS)
 src_backends_signon_providergsso_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -984,14 +992,33 @@ src_backends_signon_providergsso_la_LINK = $(LIBTOOL) $(AM_V_lt) \
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@@USE_GSSO_TRUE@am_src_backends_signon_providergsso_la_rpath =  \
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@@USE_GSSO_TRUE@   -rpath \
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@@USE_GSSO_TRUE@   $(src_backends_signon_backenddir)
+am__src_backends_signon_providersignon_la_SOURCES_DIST =  \
+       src/backends/signon/signon.h src/backends/signon/signon.cpp \
+       src/backends/signon/signonRegister.cpp
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__objects_15 = src/backends/signon/src_backends_signon_providersignon_la-signonRegister.lo
+@COND_CORE_TRUE@am__objects_16 = src/backends/signon/src_backends_signon_providersignon_la-signon.lo \
+@COND_CORE_TRUE@       $(am__objects_15)
+@COND_CORE_TRUE@@USE_SIGNON_TRUE@am_src_backends_signon_providersignon_la_OBJECTS =  \
+@COND_CORE_TRUE@@USE_SIGNON_TRUE@      $(am__objects_16)
+src_backends_signon_providersignon_la_OBJECTS =  \
+       $(am_src_backends_signon_providersignon_la_OBJECTS)
+src_backends_signon_providersignon_la_LINK = $(LIBTOOL) $(AM_V_lt) \
+       --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+       $(CXXLD) $(src_backends_signon_providersignon_la_CXXFLAGS) \
+       $(CXXFLAGS) $(src_backends_signon_providersignon_la_LDFLAGS) \
+       $(LDFLAGS) -o $@
+@COND_CORE_TRUE@@ENABLE_MODULES_FALSE@@USE_SIGNON_TRUE@am_src_backends_signon_providersignon_la_rpath =
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@@USE_SIGNON_TRUE@am_src_backends_signon_providersignon_la_rpath =  \
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@@USE_SIGNON_TRUE@ -rpath \
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@@USE_SIGNON_TRUE@ $(src_backends_signon_backenddir)
 am__src_backends_signon_provideruoa_la_SOURCES_DIST =  \
        src/backends/signon/signon.h src/backends/signon/signon.cpp \
        src/backends/signon/signonRegister.cpp
-@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__objects_14 = src/backends/signon/src_backends_signon_provideruoa_la-signonRegister.lo
-@COND_CORE_TRUE@am__objects_15 = src/backends/signon/src_backends_signon_provideruoa_la-signon.lo \
-@COND_CORE_TRUE@       $(am__objects_14)
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@am__objects_17 = src/backends/signon/src_backends_signon_provideruoa_la-signonRegister.lo
+@COND_CORE_TRUE@am__objects_18 = src/backends/signon/src_backends_signon_provideruoa_la-signon.lo \
+@COND_CORE_TRUE@       $(am__objects_17)
 @COND_CORE_TRUE@@USE_UOA_TRUE@am_src_backends_signon_provideruoa_la_OBJECTS =  \
-@COND_CORE_TRUE@@USE_UOA_TRUE@ $(am__objects_15)
+@COND_CORE_TRUE@@USE_UOA_TRUE@ $(am__objects_18)
 src_backends_signon_provideruoa_la_OBJECTS =  \
        $(am_src_backends_signon_provideruoa_la_OBJECTS)
 src_backends_signon_provideruoa_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -1008,10 +1035,10 @@ am__src_backends_sqlite_syncsqlite_la_SOURCES_DIST =  \
        src/backends/sqlite/SQLiteUtil.cpp \
        src/backends/sqlite/SQLiteContactSource.h \
        src/backends/sqlite/SQLiteContactSource.cpp
-@COND_CORE_TRUE@am__objects_16 = src/backends/sqlite/src_backends_sqlite_syncsqlite_la-SQLiteUtil.lo \
+@COND_CORE_TRUE@am__objects_19 = src/backends/sqlite/src_backends_sqlite_syncsqlite_la-SQLiteUtil.lo \
 @COND_CORE_TRUE@       src/backends/sqlite/src_backends_sqlite_syncsqlite_la-SQLiteContactSource.lo
 @COND_CORE_TRUE@am_src_backends_sqlite_syncsqlite_la_OBJECTS =  \
-@COND_CORE_TRUE@       $(am__objects_16)
+@COND_CORE_TRUE@       $(am__objects_19)
 src_backends_sqlite_syncsqlite_la_OBJECTS =  \
        $(am_src_backends_sqlite_syncsqlite_la_OBJECTS)
 src_backends_sqlite_syncsqlite_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -1033,13 +1060,13 @@ am__src_backends_webdav_syncdav_la_SOURCES_DIST =  \
        src/backends/webdav/WebDAVSource.h \
        src/backends/webdav/WebDAVSource.cpp \
        src/backends/webdav/NeonCXX.h src/backends/webdav/NeonCXX.cpp
-@COND_CORE_TRUE@am__objects_17 = src/backends/webdav/src_backends_webdav_syncdav_la-CalDAVSource.lo \
+@COND_CORE_TRUE@am__objects_20 = src/backends/webdav/src_backends_webdav_syncdav_la-CalDAVSource.lo \
 @COND_CORE_TRUE@       src/backends/webdav/src_backends_webdav_syncdav_la-CalDAVVxxSource.lo \
 @COND_CORE_TRUE@       src/backends/webdav/src_backends_webdav_syncdav_la-CardDAVSource.lo \
 @COND_CORE_TRUE@       src/backends/webdav/src_backends_webdav_syncdav_la-WebDAVSource.lo \
 @COND_CORE_TRUE@       src/backends/webdav/src_backends_webdav_syncdav_la-NeonCXX.lo
 @COND_CORE_TRUE@am_src_backends_webdav_syncdav_la_OBJECTS =  \
-@COND_CORE_TRUE@       $(am__objects_17)
+@COND_CORE_TRUE@       $(am__objects_20)
 src_backends_webdav_syncdav_la_OBJECTS =  \
        $(am_src_backends_webdav_syncdav_la_OBJECTS)
 src_backends_webdav_syncdav_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
@@ -1053,9 +1080,9 @@ src_backends_webdav_syncdav_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 am__src_backends_xmlrpc_syncxmlrpc_la_SOURCES_DIST =  \
        src/backends/xmlrpc/XMLRPCSyncSource.h \
        src/backends/xmlrpc/XMLRPCSyncSource.cpp
-@COND_CORE_TRUE@am__objects_18 = src/backends/xmlrpc/src_backends_xmlrpc_syncxmlrpc_la-XMLRPCSyncSource.lo
+@COND_CORE_TRUE@am__objects_21 = src/backends/xmlrpc/src_backends_xmlrpc_syncxmlrpc_la-XMLRPCSyncSource.lo
 @COND_CORE_TRUE@am_src_backends_xmlrpc_syncxmlrpc_la_OBJECTS =  \
-@COND_CORE_TRUE@       $(am__objects_18)
+@COND_CORE_TRUE@       $(am__objects_21)
 src_backends_xmlrpc_syncxmlrpc_la_OBJECTS =  \
        $(am_src_backends_xmlrpc_syncxmlrpc_la_OBJECTS)
 src_backends_xmlrpc_syncxmlrpc_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -1074,15 +1101,15 @@ am__src_dbus_glib_libsyncevo_dbus_la_SOURCES_DIST =  \
        src/dbus/glib/syncevo-server.h src/dbus/glib/syncevo-session.h \
        src/dbus/glib/syncevo-dbus-types.c \
        src/dbus/glib/syncevo-server.c src/dbus/glib/syncevo-session.c
-am__objects_19 =
+am__objects_22 =
 @COND_GUI_TRUE@am_src_dbus_glib_libsyncevo_dbus_la_OBJECTS =  \
-@COND_GUI_TRUE@        $(am__objects_19) \
+@COND_GUI_TRUE@        $(am__objects_22) \
 @COND_GUI_TRUE@        src/dbus/glib/src_dbus_glib_libsyncevo_dbus_la-syncevo-dbus-types.lo \
 @COND_GUI_TRUE@        src/dbus/glib/src_dbus_glib_libsyncevo_dbus_la-syncevo-server.lo \
 @COND_GUI_TRUE@        src/dbus/glib/src_dbus_glib_libsyncevo_dbus_la-syncevo-session.lo
-@COND_GUI_TRUE@am__objects_20 = src/dbus/glib/src_dbus_glib_libsyncevo_dbus_la-syncevo-marshal.lo
+@COND_GUI_TRUE@am__objects_23 = src/dbus/glib/src_dbus_glib_libsyncevo_dbus_la-syncevo-marshal.lo
 @COND_GUI_TRUE@nodist_src_dbus_glib_libsyncevo_dbus_la_OBJECTS =  \
-@COND_GUI_TRUE@        $(am__objects_20)
+@COND_GUI_TRUE@        $(am__objects_23)
 src_dbus_glib_libsyncevo_dbus_la_OBJECTS =  \
        $(am_src_dbus_glib_libsyncevo_dbus_la_OBJECTS) \
        $(nodist_src_dbus_glib_libsyncevo_dbus_la_OBJECTS)
@@ -1098,17 +1125,17 @@ src_dbus_glib_libsyncevo_dbus_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 am__dist_src_dbus_qt_libsyncevolution_qt_dbus_la_SOURCES_DIST =  \
        src/dbus/qt/dbustypes.h src/dbus/qt/dbustypes.cpp
 @ENABLE_QT_DBUS_TRUE@dist_src_dbus_qt_libsyncevolution_qt_dbus_la_OBJECTS =  \
-@ENABLE_QT_DBUS_TRUE@  $(am__objects_19) \
+@ENABLE_QT_DBUS_TRUE@  $(am__objects_22) \
 @ENABLE_QT_DBUS_TRUE@  src/dbus/qt/src_dbus_qt_libsyncevolution_qt_dbus_la-dbustypes.lo
-@ENABLE_QT_DBUS_TRUE@am__objects_21 = src/dbus/qt/src_dbus_qt_libsyncevolution_qt_dbus_la-syncevo-server-full.lo \
+@ENABLE_QT_DBUS_TRUE@am__objects_24 = src/dbus/qt/src_dbus_qt_libsyncevolution_qt_dbus_la-syncevo-server-full.lo \
 @ENABLE_QT_DBUS_TRUE@  src/dbus/qt/src_dbus_qt_libsyncevolution_qt_dbus_la-syncevo-session-full.lo \
 @ENABLE_QT_DBUS_TRUE@  src/dbus/qt/src_dbus_qt_libsyncevolution_qt_dbus_la-syncevo-connection-full.lo \
 @ENABLE_QT_DBUS_TRUE@  src/dbus/qt/src_dbus_qt_libsyncevolution_qt_dbus_la-syncevo-server-full.moc.lo \
 @ENABLE_QT_DBUS_TRUE@  src/dbus/qt/src_dbus_qt_libsyncevolution_qt_dbus_la-syncevo-session-full.moc.lo \
 @ENABLE_QT_DBUS_TRUE@  src/dbus/qt/src_dbus_qt_libsyncevolution_qt_dbus_la-syncevo-connection-full.moc.lo \
-@ENABLE_QT_DBUS_TRUE@  $(am__objects_19)
+@ENABLE_QT_DBUS_TRUE@  $(am__objects_22)
 @ENABLE_QT_DBUS_TRUE@nodist_src_dbus_qt_libsyncevolution_qt_dbus_la_OBJECTS =  \
-@ENABLE_QT_DBUS_TRUE@  $(am__objects_21)
+@ENABLE_QT_DBUS_TRUE@  $(am__objects_24)
 src_dbus_qt_libsyncevolution_qt_dbus_la_OBJECTS =  \
        $(dist_src_dbus_qt_libsyncevolution_qt_dbus_la_OBJECTS) \
        $(nodist_src_dbus_qt_libsyncevolution_qt_dbus_la_OBJECTS)
@@ -1131,13 +1158,13 @@ am__src_dbus_server_libsyncevodbushelper_la_SOURCES_DIST =  \
        src/dbus/server/session-helper.cpp \
        src/dbus/server/session-common.h \
        src/dbus/server/sync-helper.cpp
-@COND_DBUS_TRUE@am__objects_22 = $(am__objects_19)
-@COND_DBUS_TRUE@am__objects_23 = src/dbus/server/src_dbus_server_libsyncevodbushelper_la-dbus-callbacks.lo \
+@COND_DBUS_TRUE@am__objects_25 = $(am__objects_22)
+@COND_DBUS_TRUE@am__objects_26 = src/dbus/server/src_dbus_server_libsyncevodbushelper_la-dbus-callbacks.lo \
 @COND_DBUS_TRUE@       src/dbus/server/src_dbus_server_libsyncevodbushelper_la-dbus-sync.lo \
 @COND_DBUS_TRUE@       src/dbus/server/src_dbus_server_libsyncevodbushelper_la-dbus-transport-agent.lo \
 @COND_DBUS_TRUE@       src/dbus/server/src_dbus_server_libsyncevodbushelper_la-session-helper.lo
 @COND_DBUS_TRUE@am_src_dbus_server_libsyncevodbushelper_la_OBJECTS =  \
-@COND_DBUS_TRUE@       $(am__objects_22) $(am__objects_23) \
+@COND_DBUS_TRUE@       $(am__objects_25) $(am__objects_26) \
 @COND_DBUS_TRUE@       src/dbus/server/src_dbus_server_libsyncevodbushelper_la-sync-helper.lo
 src_dbus_server_libsyncevodbushelper_la_OBJECTS =  \
        $(am_src_dbus_server_libsyncevodbushelper_la_OBJECTS)
@@ -1213,8 +1240,8 @@ am__src_dbus_server_libsyncevodbusserver_la_SOURCES_DIST =  \
        src/dbus/server/pim/individual-traits.cpp \
        src/dbus/server/pim/folks.cpp src/dbus/server/pim/manager.cpp \
        src/dbus/server/main.cpp
-@COND_DBUS_TRUE@am__objects_24 = $(am__objects_22) $(am__objects_19)
-@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__objects_25 = src/dbus/server/pim/src_dbus_server_libsyncevodbusserver_la-view.lo \
+@COND_DBUS_TRUE@am__objects_27 = $(am__objects_25) $(am__objects_22)
+@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__objects_28 = src/dbus/server/pim/src_dbus_server_libsyncevodbusserver_la-view.lo \
 @COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@   src/dbus/server/pim/src_dbus_server_libsyncevodbusserver_la-full-view.lo \
 @COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@   src/dbus/server/pim/src_dbus_server_libsyncevodbusserver_la-filtered-view.lo \
 @COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@   src/dbus/server/pim/src_dbus_server_libsyncevodbusserver_la-edsf-view.lo \
@@ -1223,7 +1250,7 @@ am__src_dbus_server_libsyncevodbusserver_la_SOURCES_DIST =  \
 @COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@   src/dbus/server/pim/src_dbus_server_libsyncevodbusserver_la-individual-traits.lo \
 @COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@   src/dbus/server/pim/src_dbus_server_libsyncevodbusserver_la-folks.lo \
 @COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@   src/dbus/server/pim/src_dbus_server_libsyncevodbusserver_la-manager.lo
-@COND_DBUS_TRUE@am__objects_26 = src/dbus/server/src_dbus_server_libsyncevodbusserver_la-notification-backend-noop.lo \
+@COND_DBUS_TRUE@am__objects_29 = src/dbus/server/src_dbus_server_libsyncevodbusserver_la-notification-backend-noop.lo \
 @COND_DBUS_TRUE@       src/dbus/server/src_dbus_server_libsyncevodbusserver_la-notification-backend-libnotify.lo \
 @COND_DBUS_TRUE@       src/dbus/server/src_dbus_server_libsyncevodbusserver_la-notification-backend-mlite.lo \
 @COND_DBUS_TRUE@       src/dbus/server/src_dbus_server_libsyncevodbusserver_la-notification-manager-factory.lo \
@@ -1243,13 +1270,13 @@ am__src_dbus_server_libsyncevodbusserver_la_SOURCES_DIST =  \
 @COND_DBUS_TRUE@       src/dbus/server/src_dbus_server_libsyncevodbusserver_la-read-operations.lo \
 @COND_DBUS_TRUE@       src/dbus/server/src_dbus_server_libsyncevodbusserver_la-server.lo \
 @COND_DBUS_TRUE@       src/dbus/server/src_dbus_server_libsyncevodbusserver_la-session.lo \
-@COND_DBUS_TRUE@       $(am__objects_25)
+@COND_DBUS_TRUE@       $(am__objects_28)
 @COND_DBUS_TRUE@am_src_dbus_server_libsyncevodbusserver_la_OBJECTS =  \
-@COND_DBUS_TRUE@       $(am__objects_24) $(am__objects_26) \
+@COND_DBUS_TRUE@       $(am__objects_27) $(am__objects_29) \
 @COND_DBUS_TRUE@       src/dbus/server/src_dbus_server_libsyncevodbusserver_la-main.lo
-@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__objects_27 = src/dbus/server/pim/src_dbus_server_libsyncevodbusserver_la-locale-factory-@DBUS_PIM_PLUGIN@.lo
+@COND_DBUS_PIM_TRUE@@COND_DBUS_TRUE@am__objects_30 = src/dbus/server/pim/src_dbus_server_libsyncevodbusserver_la-locale-factory-@DBUS_PIM_PLUGIN@.lo
 @COND_DBUS_TRUE@nodist_src_dbus_server_libsyncevodbusserver_la_OBJECTS =  \
-@COND_DBUS_TRUE@       $(am__objects_27)
+@COND_DBUS_TRUE@       $(am__objects_30)
 src_dbus_server_libsyncevodbusserver_la_OBJECTS =  \
        $(am_src_dbus_server_libsyncevodbusserver_la_OBJECTS) \
        $(nodist_src_dbus_server_libsyncevodbusserver_la_OBJECTS)
@@ -1314,13 +1341,14 @@ src_gnome_bluetooth_libgbtsyncevolution_la_LINK = $(LIBTOOL) \
 @ENABLE_GNOME_BLUETOOTH_PANEL_TRUE@    $(src_gnome_bluetoothdir)
 @COND_CORE_TRUE@@ENABLE_UNIT_TESTS_TRUE@am__DEPENDENCIES_4 =  \
 @COND_CORE_TRUE@@ENABLE_UNIT_TESTS_TRUE@       $(am__DEPENDENCIES_1)
-@COND_CORE_TRUE@@ENABLE_OBEX_TRUE@am__DEPENDENCIES_5 =  \
+@COND_CORE_TRUE@@ENABLE_EVOLUTION_COMPATIBILITY_FALSE@@ENABLE_ICALTZ_UTIL_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
+@COND_CORE_TRUE@@ENABLE_OBEX_TRUE@am__DEPENDENCIES_6 =  \
 @COND_CORE_TRUE@@ENABLE_OBEX_TRUE@     $(am__DEPENDENCIES_1)
-@COND_CORE_TRUE@@ENABLE_BLUETOOTH_TRUE@@ENABLE_OBEX_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-@COND_CORE_TRUE@am__DEPENDENCIES_7 =  \
+@COND_CORE_TRUE@@ENABLE_BLUETOOTH_TRUE@@ENABLE_OBEX_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+@COND_CORE_TRUE@am__DEPENDENCIES_8 =  \
 @COND_CORE_TRUE@       $(gdbus_build_dir)/libgdbussyncevo.la \
 @COND_CORE_TRUE@       $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
-@COND_CORE_TRUE@       $(am__DEPENDENCIES_6)
+@COND_CORE_TRUE@       $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7)
 am__src_syncevo_libsyncevolution_la_SOURCES_DIST =  \
        src/syncevo/GeeSupport.h src/syncevo/GValueSupport.h \
        src/syncevo/EDSClient.h src/syncevo/EDSClient.cpp \
@@ -1333,6 +1361,7 @@ am__src_syncevo_libsyncevolution_la_SOURCES_DIST =  \
        src/syncevo/VolatileConfigTree.h src/syncevo/SmartPtr.h \
        src/syncevo/eds_abi_wrapper.h src/syncevo/eds_abi_wrapper.cpp \
        src/syncevo/GLibSupport.h src/syncevo/GLibSupport.cpp \
+       src/syncevo/GVariantSupport.h src/syncevo/GVariantSupport.cpp \
        src/syncevo/ThreadSupport.h src/syncevo/SyncML.h \
        src/syncevo/SyncML.cpp src/syncevo/SynthesisEngine.h \
        src/syncevo/SynthesisEngine.cpp src/syncevo/Logging.h \
@@ -1347,13 +1376,14 @@ am__src_syncevo_libsyncevolution_la_SOURCES_DIST =  \
        src/syncevo/SoupTransportAgent.h \
        src/syncevo/SoupTransportAgent.cpp \
        src/syncevo/LocalTransportAgent.h \
-       src/syncevo/LocalTransportAgent.cpp src/syncevo/util.cpp \
+       src/syncevo/LocalTransportAgent.cpp src/syncevo/Exception.h \
+       src/syncevo/Exception.cpp src/syncevo/util.cpp \
        src/syncevo/util.h src/syncevo/BoostHelper.h \
-       src/syncevo/TmpFile.cpp src/syncevo/TmpFile.h \
-       src/syncevo/Timespec.h src/syncevo/lcs.h src/syncevo/lcs.cpp \
-       src/syncevo/ForkExec.cpp src/syncevo/ForkExec.h \
-       src/syncevo/Cmdline.cpp src/syncevo/Cmdline.h \
-       src/syncevo/CmdlineSyncClient.h \
+       src/syncevo/GuardFD.h src/syncevo/TmpFile.cpp \
+       src/syncevo/TmpFile.h src/syncevo/Timespec.h src/syncevo/lcs.h \
+       src/syncevo/lcs.cpp src/syncevo/ForkExec.cpp \
+       src/syncevo/ForkExec.h src/syncevo/Cmdline.cpp \
+       src/syncevo/Cmdline.h src/syncevo/CmdlineSyncClient.h \
        src/syncevo/CmdlineSyncClient.cpp src/syncevo/SyncSource.h \
        src/syncevo/SyncSource.cpp src/syncevo/SynthesisDBPlugin.cpp \
        src/syncevo/SuspendFlags.h src/syncevo/SuspendFlags.cpp \
@@ -1376,17 +1406,23 @@ am__src_syncevo_libsyncevolution_la_SOURCES_DIST =  \
        src/syncevo/FileConfigTree.h src/syncevo/FileConfigTree.cpp \
        src/syncevo/MapSyncSource.h src/syncevo/MapSyncSource.cpp \
        src/syncevo/TrackingSyncSource.h \
-       src/syncevo/TrackingSyncSource.cpp src/syncevo/icalstrdup.c \
-       src/syncevo/icalstrdup.h src/syncevo/ObexTransportAgent.h \
+       src/syncevo/TrackingSyncSource.cpp \
+       src/syncevo/gsignond-pipe-stream.h \
+       src/syncevo/gsignond-pipe-stream.cpp src/syncevo/icalstrdup.c \
+       src/syncevo/icalstrdup.h src/syncevo/icaltz-util.c \
+       src/syncevo/icaltz-util.h src/syncevo/ObexTransportAgent.h \
        src/syncevo/ObexTransportAgent.cpp
-@COND_CORE_TRUE@@ENABLE_ICAL_TRUE@am__objects_28 = src/syncevo/src_syncevo_libsyncevolution_la-icalstrdup.lo
-@COND_CORE_TRUE@@ENABLE_OBEX_TRUE@am__objects_29 = src/syncevo/src_syncevo_libsyncevolution_la-ObexTransportAgent.lo
-@COND_CORE_TRUE@am__objects_30 = src/syncevo/src_syncevo_libsyncevolution_la-EDSClient.lo \
+@COND_CORE_TRUE@@COND_GIO_GDBUS_TRUE@am__objects_31 = src/syncevo/src_syncevo_libsyncevolution_la-gsignond-pipe-stream.lo
+@COND_CORE_TRUE@@ENABLE_ICAL_TRUE@am__objects_32 = src/syncevo/src_syncevo_libsyncevolution_la-icalstrdup.lo
+@COND_CORE_TRUE@@ENABLE_ICALTZ_UTIL_TRUE@am__objects_33 = src/syncevo/src_syncevo_libsyncevolution_la-icaltz-util.lo
+@COND_CORE_TRUE@@ENABLE_OBEX_TRUE@am__objects_34 = src/syncevo/src_syncevo_libsyncevolution_la-ObexTransportAgent.lo
+@COND_CORE_TRUE@am__objects_35 = src/syncevo/src_syncevo_libsyncevolution_la-EDSClient.lo \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-IdentityProvider.lo \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-ConfigFilter.lo \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-ConfigNode.lo \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-eds_abi_wrapper.lo \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-GLibSupport.lo \
+@COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-GVariantSupport.lo \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-SyncML.lo \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-SynthesisEngine.lo \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-Logging.lo \
@@ -1398,6 +1434,7 @@ am__src_syncevo_libsyncevolution_la_SOURCES_DIST =  \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-CurlTransportAgent.lo \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-SoupTransportAgent.lo \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-LocalTransportAgent.lo \
+@COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-Exception.lo \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-util.lo \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-TmpFile.lo \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-lcs.lo \
@@ -1422,9 +1459,10 @@ am__src_syncevo_libsyncevolution_la_SOURCES_DIST =  \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-FileConfigTree.lo \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-MapSyncSource.lo \
 @COND_CORE_TRUE@       src/syncevo/src_syncevo_libsyncevolution_la-TrackingSyncSource.lo \
-@COND_CORE_TRUE@       $(am__objects_28) $(am__objects_29)
+@COND_CORE_TRUE@       $(am__objects_31) $(am__objects_32) \
+@COND_CORE_TRUE@       $(am__objects_33) $(am__objects_34)
 @COND_CORE_TRUE@am_src_syncevo_libsyncevolution_la_OBJECTS =  \
-@COND_CORE_TRUE@       $(am__objects_30)
+@COND_CORE_TRUE@       $(am__objects_35)
 @COND_CORE_TRUE@nodist_src_syncevo_libsyncevolution_la_OBJECTS = src/syncevo/src_syncevo_libsyncevolution_la-SyncEvolutionXML.lo
 src_syncevo_libsyncevolution_la_OBJECTS =  \
        $(am_src_syncevo_libsyncevolution_la_OBJECTS) \
@@ -1447,19 +1485,18 @@ src_syncevo_libsyncevolution_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 @COND_CORE_TRUE@am__EXEEXT_4 = src/syncevolution$(EXEEXT)
 @COND_DBUS_TRUE@am__EXEEXT_5 = src/syncevo-dbus-server$(EXEEXT) \
 @COND_DBUS_TRUE@       src/syncevo-dbus-helper$(EXEEXT)
-@COND_GIO_GDBUS_TRUE@am__EXEEXT_6 = src/gdbusxx/example$(EXEEXT)
-@COND_GIO_GDBUS_FALSE@am__EXEEXT_7 = src/gdbus/example$(EXEEXT)
-@COND_GUI_TRUE@am__EXEEXT_8 =  \
+@COND_GIO_GDBUS_FALSE@am__EXEEXT_6 = src/gdbus/example$(EXEEXT)
+@COND_GUI_TRUE@am__EXEEXT_7 =  \
 @COND_GUI_TRUE@        src/dbus/glib/test-syncevo-dbus$(EXEEXT)
-@COND_CORE_TRUE@@COND_DBUS_TRUE@am__EXEEXT_9 = test/dbus-client-server$(EXEEXT)
-@ENABLE_TESTING_TRUE@am__EXEEXT_10 = src/client-test$(EXEEXT)
+@COND_CORE_TRUE@@COND_DBUS_TRUE@am__EXEEXT_8 = test/dbus-client-server$(EXEEXT)
+@ENABLE_TESTING_TRUE@am__EXEEXT_9 = src/client-test$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS) \
        $(test_PROGRAMS)
 am_src_abort_redirect_OBJECTS =  \
        test/src_abort_redirect-abort-redirect.$(OBJEXT)
 src_abort_redirect_OBJECTS = $(am_src_abort_redirect_OBJECTS)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8) \
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_10 = $(am__DEPENDENCIES_9) \
        src/syncevo/libsyncevolution.la $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
@@ -1468,10 +1505,9 @@ src_abort_redirect_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
        $(src_abort_redirect_CXXFLAGS) $(CXXFLAGS) \
        $(src_abort_redirect_LDFLAGS) $(LDFLAGS) -o $@
 am__src_client_test_SOURCES_DIST = src/client-test-app.cpp \
-       test/ClientTest.cpp test/ClientTest.h test/ClientTestAssert.h \
-       test/client-test-main.cpp \
+       test/ClientTest.cpp test/IcalTest.cpp test/ClientTest.h \
+       test/ClientTestAssert.h test/client-test-main.cpp \
        src/backends/activesync/ActiveSyncSourceRegister.cpp \
-       src/backends/addressbook/AddressBookSourceRegister.cpp \
        src/backends/akonadi/AkonadiSyncSourceRegister.cpp \
        src/backends/evolution/EvolutionCalendarSourceRegister.cpp \
        src/backends/evolution/EvolutionContactSourceRegister.cpp \
@@ -1481,14 +1517,14 @@ am__src_client_test_SOURCES_DIST = src/client-test-app.cpp \
        src/backends/kcalextended/KCalExtendedSourceRegister.cpp \
        src/backends/kde/KDEPlatformRegister.cpp \
        src/backends/maemo/MaemoCalendarSourceRegister.cpp \
+       src/backends/oauth2/oauth2Register.cpp \
        src/backends/pbap/PbapSyncSourceRegister.cpp \
        src/backends/qtcontacts/QtContactsSourceRegister.cpp \
        src/backends/signon/signonRegister.cpp \
        src/backends/sqlite/SQLiteContactSourceRegister.cpp \
        src/backends/webdav/WebDAVSourceRegister.cpp \
        src/backends/xmlrpc/XMLRPCSyncSourceRegister.cpp
-@COND_CORE_TRUE@am__objects_31 = src/backends/activesync/src_client_test-ActiveSyncSourceRegister.$(OBJEXT) \
-@COND_CORE_TRUE@       src/backends/addressbook/src_client_test-AddressBookSourceRegister.$(OBJEXT) \
+@COND_CORE_TRUE@am__objects_36 = src/backends/activesync/src_client_test-ActiveSyncSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/akonadi/src_client_test-AkonadiSyncSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/evolution/src_client_test-EvolutionCalendarSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/evolution/src_client_test-EvolutionContactSourceRegister.$(OBJEXT) \
@@ -1498,25 +1534,29 @@ am__src_client_test_SOURCES_DIST = src/client-test-app.cpp \
 @COND_CORE_TRUE@       src/backends/kcalextended/src_client_test-KCalExtendedSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/kde/src_client_test-KDEPlatformRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/maemo/src_client_test-MaemoCalendarSourceRegister.$(OBJEXT) \
+@COND_CORE_TRUE@       src/backends/oauth2/src_client_test-oauth2Register.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/pbap/src_client_test-PbapSyncSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/qtcontacts/src_client_test-QtContactsSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/signon/src_client_test-signonRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/sqlite/src_client_test-SQLiteContactSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/webdav/src_client_test-WebDAVSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/xmlrpc/src_client_test-XMLRPCSyncSourceRegister.$(OBJEXT)
-@ENABLE_MODULES_FALSE@am__objects_32 = $(am__objects_31)
-am__objects_33 = $(am__objects_32)
+@ENABLE_MODULES_FALSE@am__objects_37 = $(am__objects_36)
+am__objects_38 = $(am__objects_37)
 am_src_client_test_OBJECTS =  \
        src/src_client_test-client-test-app.$(OBJEXT) \
        test/src_client_test-ClientTest.$(OBJEXT) \
+       test/src_client_test-IcalTest.$(OBJEXT) \
        test/src_client_test-client-test-main.$(OBJEXT) \
-       $(am__objects_33)
-am__objects_34 = $(am__objects_19)
-@ENABLE_TESTING_FALSE@am__objects_35 = $(am__objects_34)
+       $(am__objects_38)
+am__objects_39 = $(am__objects_22)
+@ENABLE_TESTING_FALSE@am__objects_40 = $(am__objects_39)
 nodist_src_client_test_OBJECTS = test/src_client_test-test.$(OBJEXT) \
-       $(am__objects_35)
+       $(am__objects_40)
 src_client_test_OBJECTS = $(am_src_client_test_OBJECTS) \
        $(nodist_src_client_test_OBJECTS)
+@ENABLE_EVOLUTION_COMPATIBILITY_FALSE@am__DEPENDENCIES_11 =  \
+@ENABLE_EVOLUTION_COMPATIBILITY_FALSE@ $(am__DEPENDENCIES_1)
 src_client_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
        $(src_client_test_CXXFLAGS) $(CXXFLAGS) \
@@ -1541,17 +1581,6 @@ src_gdbus_example_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
        $(src_gdbus_example_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-am__src_gdbusxx_example_SOURCES_DIST = src/gdbusxx/test/example.cpp
-@COND_GIO_GDBUS_TRUE@am_src_gdbusxx_example_OBJECTS = src/gdbusxx/test/src_gdbusxx_example-example.$(OBJEXT)
-src_gdbusxx_example_OBJECTS = $(am_src_gdbusxx_example_OBJECTS)
-@COND_GIO_GDBUS_TRUE@src_gdbusxx_example_DEPENDENCIES =  \
-@COND_GIO_GDBUS_TRUE@  src/gdbusxx/libgdbussyncevo.la \
-@COND_GIO_GDBUS_TRUE@  $(am__DEPENDENCIES_1) \
-@COND_GIO_GDBUS_TRUE@  $(am__DEPENDENCIES_1)
-src_gdbusxx_example_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-       $(src_gdbusxx_example_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
 am__src_gtk_ui_sync_ui_SOURCES_DIST = src/gtk-ui/main.c \
        src/gtk-ui/sync-ui.c src/gtk-ui/sync-ui.h \
        src/gtk-ui/sync-ui-config.c src/gtk-ui/sync-ui-config.h \
@@ -1581,21 +1610,21 @@ am__src_gtk_ui_sync_ui_gtk_SOURCES_DIST = src/gtk-ui/main.c \
        src/gtk-ui/sync-config-widget.c \
        src/gtk-ui/sync-config-widget.h src/gtk-ui/gtkinfobar.c \
        src/gtk-ui/gtkinfobar.h
-@COND_GTK2_TRUE@@COND_GUI_TRUE@am__objects_36 = src/gtk-ui/src_gtk_ui_sync_ui_gtk-main.$(OBJEXT) \
+@COND_GTK2_TRUE@@COND_GUI_TRUE@am__objects_41 = src/gtk-ui/src_gtk_ui_sync_ui_gtk-main.$(OBJEXT) \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@        src/gtk-ui/src_gtk_ui_sync_ui_gtk-sync-ui.$(OBJEXT) \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@        src/gtk-ui/src_gtk_ui_sync_ui_gtk-sync-ui-config.$(OBJEXT) \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@        src/gtk-ui/src_gtk_ui_sync_ui_gtk-mux-frame.$(OBJEXT) \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@        src/gtk-ui/src_gtk_ui_sync_ui_gtk-sync-config-widget.$(OBJEXT) \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@        src/gtk-ui/src_gtk_ui_sync_ui_gtk-gtkinfobar.$(OBJEXT)
 @COND_GTK2_TRUE@@COND_GUI_TRUE@am_src_gtk_ui_sync_ui_gtk_OBJECTS =  \
-@COND_GTK2_TRUE@@COND_GUI_TRUE@        $(am__objects_36)
+@COND_GTK2_TRUE@@COND_GUI_TRUE@        $(am__objects_41)
 src_gtk_ui_sync_ui_gtk_OBJECTS = $(am_src_gtk_ui_sync_ui_gtk_OBJECTS)
-@COND_GTK2_TRUE@@COND_GUI_TRUE@am__DEPENDENCIES_10 =  \
+@COND_GTK2_TRUE@@COND_GUI_TRUE@am__DEPENDENCIES_12 =  \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@        $(am__DEPENDENCIES_1) \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@        $(am__DEPENDENCIES_1) \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@        $(top_builddir)/src/dbus/glib/libsyncevo-dbus.la
 @COND_GTK2_TRUE@@COND_GUI_TRUE@src_gtk_ui_sync_ui_gtk_DEPENDENCIES =  \
-@COND_GTK2_TRUE@@COND_GUI_TRUE@        $(am__DEPENDENCIES_10)
+@COND_GTK2_TRUE@@COND_GUI_TRUE@        $(am__DEPENDENCIES_12)
 src_gtk_ui_sync_ui_gtk_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(src_gtk_ui_sync_ui_gtk_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -1607,18 +1636,18 @@ am__src_gtk_ui_sync_ui_moblin_SOURCES_DIST = src/gtk-ui/main.c \
        src/gtk-ui/sync-config-widget.c \
        src/gtk-ui/sync-config-widget.h src/gtk-ui/gtkinfobar.c \
        src/gtk-ui/gtkinfobar.h
-@COND_GTK2_TRUE@@COND_GUI_TRUE@am__objects_37 = src/gtk-ui/src_gtk_ui_sync_ui_moblin-main.$(OBJEXT) \
+@COND_GTK2_TRUE@@COND_GUI_TRUE@am__objects_42 = src/gtk-ui/src_gtk_ui_sync_ui_moblin-main.$(OBJEXT) \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@        src/gtk-ui/src_gtk_ui_sync_ui_moblin-sync-ui.$(OBJEXT) \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@        src/gtk-ui/src_gtk_ui_sync_ui_moblin-sync-ui-config.$(OBJEXT) \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@        src/gtk-ui/src_gtk_ui_sync_ui_moblin-mux-frame.$(OBJEXT) \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@        src/gtk-ui/src_gtk_ui_sync_ui_moblin-sync-config-widget.$(OBJEXT) \
 @COND_GTK2_TRUE@@COND_GUI_TRUE@        src/gtk-ui/src_gtk_ui_sync_ui_moblin-gtkinfobar.$(OBJEXT)
 @COND_GTK2_TRUE@@COND_GUI_TRUE@am_src_gtk_ui_sync_ui_moblin_OBJECTS =  \
-@COND_GTK2_TRUE@@COND_GUI_TRUE@        $(am__objects_37)
+@COND_GTK2_TRUE@@COND_GUI_TRUE@        $(am__objects_42)
 src_gtk_ui_sync_ui_moblin_OBJECTS =  \
        $(am_src_gtk_ui_sync_ui_moblin_OBJECTS)
 @COND_GTK2_TRUE@@COND_GUI_TRUE@src_gtk_ui_sync_ui_moblin_DEPENDENCIES =  \
-@COND_GTK2_TRUE@@COND_GUI_TRUE@        $(am__DEPENDENCIES_10)
+@COND_GTK2_TRUE@@COND_GUI_TRUE@        $(am__DEPENDENCIES_12)
 src_gtk_ui_sync_ui_moblin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(src_gtk_ui_sync_ui_moblin_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -1649,21 +1678,21 @@ am__src_gtk3_ui_sync_ui_gtk_SOURCES_DIST = src/gtk3-ui/main.c \
        src/gtk3-ui/mux-frame.c src/gtk3-ui/mux-frame.h \
        src/gtk3-ui/sync-config-widget.c \
        src/gtk3-ui/sync-config-widget.h
-@COND_GTK2_FALSE@@COND_GUI_TRUE@am__objects_38 = src/gtk3-ui/src_gtk3_ui_sync_ui_gtk-main.$(OBJEXT) \
+@COND_GTK2_FALSE@@COND_GUI_TRUE@am__objects_43 = src/gtk3-ui/src_gtk3_ui_sync_ui_gtk-main.$(OBJEXT) \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@       src/gtk3-ui/src_gtk3_ui_sync_ui_gtk-sync-ui.$(OBJEXT) \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@       src/gtk3-ui/src_gtk3_ui_sync_ui_gtk-sync-ui-config.$(OBJEXT) \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@       src/gtk3-ui/src_gtk3_ui_sync_ui_gtk-mux-frame.$(OBJEXT) \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@       src/gtk3-ui/src_gtk3_ui_sync_ui_gtk-sync-config-widget.$(OBJEXT)
 @COND_GTK2_FALSE@@COND_GUI_TRUE@am_src_gtk3_ui_sync_ui_gtk_OBJECTS =  \
-@COND_GTK2_FALSE@@COND_GUI_TRUE@       $(am__objects_38)
+@COND_GTK2_FALSE@@COND_GUI_TRUE@       $(am__objects_43)
 src_gtk3_ui_sync_ui_gtk_OBJECTS =  \
        $(am_src_gtk3_ui_sync_ui_gtk_OBJECTS)
-@COND_GTK2_FALSE@@COND_GUI_TRUE@am__DEPENDENCIES_11 =  \
+@COND_GTK2_FALSE@@COND_GUI_TRUE@am__DEPENDENCIES_13 =  \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@       $(am__DEPENDENCIES_1) \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@       $(am__DEPENDENCIES_1) \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@       $(top_builddir)/src/dbus/glib/libsyncevo-dbus.la
 @COND_GTK2_FALSE@@COND_GUI_TRUE@src_gtk3_ui_sync_ui_gtk_DEPENDENCIES =  \
-@COND_GTK2_FALSE@@COND_GUI_TRUE@       $(am__DEPENDENCIES_11)
+@COND_GTK2_FALSE@@COND_GUI_TRUE@       $(am__DEPENDENCIES_13)
 src_gtk3_ui_sync_ui_gtk_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(src_gtk3_ui_sync_ui_gtk_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -1674,24 +1703,23 @@ am__src_gtk3_ui_sync_ui_moblin_SOURCES_DIST = src/gtk3-ui/main.c \
        src/gtk3-ui/mux-frame.c src/gtk3-ui/mux-frame.h \
        src/gtk3-ui/sync-config-widget.c \
        src/gtk3-ui/sync-config-widget.h
-@COND_GTK2_FALSE@@COND_GUI_TRUE@am__objects_39 = src/gtk3-ui/src_gtk3_ui_sync_ui_moblin-main.$(OBJEXT) \
+@COND_GTK2_FALSE@@COND_GUI_TRUE@am__objects_44 = src/gtk3-ui/src_gtk3_ui_sync_ui_moblin-main.$(OBJEXT) \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@       src/gtk3-ui/src_gtk3_ui_sync_ui_moblin-sync-ui.$(OBJEXT) \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@       src/gtk3-ui/src_gtk3_ui_sync_ui_moblin-sync-ui-config.$(OBJEXT) \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@       src/gtk3-ui/src_gtk3_ui_sync_ui_moblin-mux-frame.$(OBJEXT) \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@       src/gtk3-ui/src_gtk3_ui_sync_ui_moblin-sync-config-widget.$(OBJEXT)
 @COND_GTK2_FALSE@@COND_GUI_TRUE@am_src_gtk3_ui_sync_ui_moblin_OBJECTS =  \
-@COND_GTK2_FALSE@@COND_GUI_TRUE@       $(am__objects_39)
+@COND_GTK2_FALSE@@COND_GUI_TRUE@       $(am__objects_44)
 src_gtk3_ui_sync_ui_moblin_OBJECTS =  \
        $(am_src_gtk3_ui_sync_ui_moblin_OBJECTS)
 @COND_GTK2_FALSE@@COND_GUI_TRUE@src_gtk3_ui_sync_ui_moblin_DEPENDENCIES =  \
-@COND_GTK2_FALSE@@COND_GUI_TRUE@       $(am__DEPENDENCIES_11)
+@COND_GTK2_FALSE@@COND_GUI_TRUE@       $(am__DEPENDENCIES_13)
 src_gtk3_ui_sync_ui_moblin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(src_gtk3_ui_sync_ui_moblin_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
 am__src_syncevo_dbus_helper_SOURCES_DIST =  \
        src/backends/activesync/ActiveSyncSourceRegister.cpp \
-       src/backends/addressbook/AddressBookSourceRegister.cpp \
        src/backends/akonadi/AkonadiSyncSourceRegister.cpp \
        src/backends/evolution/EvolutionCalendarSourceRegister.cpp \
        src/backends/evolution/EvolutionContactSourceRegister.cpp \
@@ -1701,14 +1729,14 @@ am__src_syncevo_dbus_helper_SOURCES_DIST =  \
        src/backends/kcalextended/KCalExtendedSourceRegister.cpp \
        src/backends/kde/KDEPlatformRegister.cpp \
        src/backends/maemo/MaemoCalendarSourceRegister.cpp \
+       src/backends/oauth2/oauth2Register.cpp \
        src/backends/pbap/PbapSyncSourceRegister.cpp \
        src/backends/qtcontacts/QtContactsSourceRegister.cpp \
        src/backends/signon/signonRegister.cpp \
        src/backends/sqlite/SQLiteContactSourceRegister.cpp \
        src/backends/webdav/WebDAVSourceRegister.cpp \
        src/backends/xmlrpc/XMLRPCSyncSourceRegister.cpp
-@COND_CORE_TRUE@am__objects_40 = src/backends/activesync/src_syncevo_dbus_helper-ActiveSyncSourceRegister.$(OBJEXT) \
-@COND_CORE_TRUE@       src/backends/addressbook/src_syncevo_dbus_helper-AddressBookSourceRegister.$(OBJEXT) \
+@COND_CORE_TRUE@am__objects_45 = src/backends/activesync/src_syncevo_dbus_helper-ActiveSyncSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/akonadi/src_syncevo_dbus_helper-AkonadiSyncSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/evolution/src_syncevo_dbus_helper-EvolutionCalendarSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/evolution/src_syncevo_dbus_helper-EvolutionContactSourceRegister.$(OBJEXT) \
@@ -1718,16 +1746,17 @@ am__src_syncevo_dbus_helper_SOURCES_DIST =  \
 @COND_CORE_TRUE@       src/backends/kcalextended/src_syncevo_dbus_helper-KCalExtendedSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/kde/src_syncevo_dbus_helper-KDEPlatformRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/maemo/src_syncevo_dbus_helper-MaemoCalendarSourceRegister.$(OBJEXT) \
+@COND_CORE_TRUE@       src/backends/oauth2/src_syncevo_dbus_helper-oauth2Register.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/pbap/src_syncevo_dbus_helper-PbapSyncSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/qtcontacts/src_syncevo_dbus_helper-QtContactsSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/signon/src_syncevo_dbus_helper-signonRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/sqlite/src_syncevo_dbus_helper-SQLiteContactSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/webdav/src_syncevo_dbus_helper-WebDAVSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/xmlrpc/src_syncevo_dbus_helper-XMLRPCSyncSourceRegister.$(OBJEXT)
-@ENABLE_MODULES_FALSE@am__objects_41 = $(am__objects_40)
-am__objects_42 = $(am__objects_41)
+@ENABLE_MODULES_FALSE@am__objects_46 = $(am__objects_45)
+am__objects_47 = $(am__objects_46)
 @COND_DBUS_TRUE@am_src_syncevo_dbus_helper_OBJECTS =  \
-@COND_DBUS_TRUE@       $(am__objects_42)
+@COND_DBUS_TRUE@       $(am__objects_47)
 @COND_DBUS_TRUE@@ENABLE_UNIT_TESTS_TRUE@nodist_src_syncevo_dbus_helper_OBJECTS = test/src_syncevo_dbus_helper-test.$(OBJEXT)
 src_syncevo_dbus_helper_OBJECTS =  \
        $(am_src_syncevo_dbus_helper_OBJECTS) \
@@ -1738,7 +1767,6 @@ src_syncevo_dbus_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
        $(src_syncevo_dbus_helper_LDFLAGS) $(LDFLAGS) -o $@
 am__src_syncevo_dbus_server_SOURCES_DIST =  \
        src/backends/activesync/ActiveSyncSourceRegister.cpp \
-       src/backends/addressbook/AddressBookSourceRegister.cpp \
        src/backends/akonadi/AkonadiSyncSourceRegister.cpp \
        src/backends/evolution/EvolutionCalendarSourceRegister.cpp \
        src/backends/evolution/EvolutionContactSourceRegister.cpp \
@@ -1748,14 +1776,14 @@ am__src_syncevo_dbus_server_SOURCES_DIST =  \
        src/backends/kcalextended/KCalExtendedSourceRegister.cpp \
        src/backends/kde/KDEPlatformRegister.cpp \
        src/backends/maemo/MaemoCalendarSourceRegister.cpp \
+       src/backends/oauth2/oauth2Register.cpp \
        src/backends/pbap/PbapSyncSourceRegister.cpp \
        src/backends/qtcontacts/QtContactsSourceRegister.cpp \
        src/backends/signon/signonRegister.cpp \
        src/backends/sqlite/SQLiteContactSourceRegister.cpp \
        src/backends/webdav/WebDAVSourceRegister.cpp \
        src/backends/xmlrpc/XMLRPCSyncSourceRegister.cpp
-@COND_CORE_TRUE@am__objects_43 = src/backends/activesync/src_syncevo_dbus_server-ActiveSyncSourceRegister.$(OBJEXT) \
-@COND_CORE_TRUE@       src/backends/addressbook/src_syncevo_dbus_server-AddressBookSourceRegister.$(OBJEXT) \
+@COND_CORE_TRUE@am__objects_48 = src/backends/activesync/src_syncevo_dbus_server-ActiveSyncSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/akonadi/src_syncevo_dbus_server-AkonadiSyncSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/evolution/src_syncevo_dbus_server-EvolutionCalendarSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/evolution/src_syncevo_dbus_server-EvolutionContactSourceRegister.$(OBJEXT) \
@@ -1765,16 +1793,17 @@ am__src_syncevo_dbus_server_SOURCES_DIST =  \
 @COND_CORE_TRUE@       src/backends/kcalextended/src_syncevo_dbus_server-KCalExtendedSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/kde/src_syncevo_dbus_server-KDEPlatformRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/maemo/src_syncevo_dbus_server-MaemoCalendarSourceRegister.$(OBJEXT) \
+@COND_CORE_TRUE@       src/backends/oauth2/src_syncevo_dbus_server-oauth2Register.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/pbap/src_syncevo_dbus_server-PbapSyncSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/qtcontacts/src_syncevo_dbus_server-QtContactsSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/signon/src_syncevo_dbus_server-signonRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/sqlite/src_syncevo_dbus_server-SQLiteContactSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/webdav/src_syncevo_dbus_server-WebDAVSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/xmlrpc/src_syncevo_dbus_server-XMLRPCSyncSourceRegister.$(OBJEXT)
-@ENABLE_MODULES_FALSE@am__objects_44 = $(am__objects_43)
-am__objects_45 = $(am__objects_44)
+@ENABLE_MODULES_FALSE@am__objects_49 = $(am__objects_48)
+am__objects_50 = $(am__objects_49)
 @COND_DBUS_TRUE@am_src_syncevo_dbus_server_OBJECTS =  \
-@COND_DBUS_TRUE@       $(am__objects_45)
+@COND_DBUS_TRUE@       $(am__objects_50)
 @COND_DBUS_TRUE@@ENABLE_UNIT_TESTS_TRUE@nodist_src_syncevo_dbus_server_OBJECTS = test/src_syncevo_dbus_server-test.$(OBJEXT)
 src_syncevo_dbus_server_OBJECTS =  \
        $(am_src_syncevo_dbus_server_OBJECTS) \
@@ -1785,7 +1814,6 @@ src_syncevo_dbus_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
        $(src_syncevo_dbus_server_LDFLAGS) $(LDFLAGS) -o $@
 am__src_syncevo_local_sync_SOURCES_DIST = src/syncevo-local-sync.cpp \
        src/backends/activesync/ActiveSyncSourceRegister.cpp \
-       src/backends/addressbook/AddressBookSourceRegister.cpp \
        src/backends/akonadi/AkonadiSyncSourceRegister.cpp \
        src/backends/evolution/EvolutionCalendarSourceRegister.cpp \
        src/backends/evolution/EvolutionContactSourceRegister.cpp \
@@ -1795,14 +1823,14 @@ am__src_syncevo_local_sync_SOURCES_DIST = src/syncevo-local-sync.cpp \
        src/backends/kcalextended/KCalExtendedSourceRegister.cpp \
        src/backends/kde/KDEPlatformRegister.cpp \
        src/backends/maemo/MaemoCalendarSourceRegister.cpp \
+       src/backends/oauth2/oauth2Register.cpp \
        src/backends/pbap/PbapSyncSourceRegister.cpp \
        src/backends/qtcontacts/QtContactsSourceRegister.cpp \
        src/backends/signon/signonRegister.cpp \
        src/backends/sqlite/SQLiteContactSourceRegister.cpp \
        src/backends/webdav/WebDAVSourceRegister.cpp \
        src/backends/xmlrpc/XMLRPCSyncSourceRegister.cpp
-@COND_CORE_TRUE@am__objects_46 = src/backends/activesync/src_syncevo_local_sync-ActiveSyncSourceRegister.$(OBJEXT) \
-@COND_CORE_TRUE@       src/backends/addressbook/src_syncevo_local_sync-AddressBookSourceRegister.$(OBJEXT) \
+@COND_CORE_TRUE@am__objects_51 = src/backends/activesync/src_syncevo_local_sync-ActiveSyncSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/akonadi/src_syncevo_local_sync-AkonadiSyncSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/evolution/src_syncevo_local_sync-EvolutionCalendarSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/evolution/src_syncevo_local_sync-EvolutionContactSourceRegister.$(OBJEXT) \
@@ -1812,17 +1840,18 @@ am__src_syncevo_local_sync_SOURCES_DIST = src/syncevo-local-sync.cpp \
 @COND_CORE_TRUE@       src/backends/kcalextended/src_syncevo_local_sync-KCalExtendedSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/kde/src_syncevo_local_sync-KDEPlatformRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/maemo/src_syncevo_local_sync-MaemoCalendarSourceRegister.$(OBJEXT) \
+@COND_CORE_TRUE@       src/backends/oauth2/src_syncevo_local_sync-oauth2Register.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/pbap/src_syncevo_local_sync-PbapSyncSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/qtcontacts/src_syncevo_local_sync-QtContactsSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/signon/src_syncevo_local_sync-signonRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/sqlite/src_syncevo_local_sync-SQLiteContactSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/webdav/src_syncevo_local_sync-WebDAVSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/xmlrpc/src_syncevo_local_sync-XMLRPCSyncSourceRegister.$(OBJEXT)
-@ENABLE_MODULES_FALSE@am__objects_47 = $(am__objects_46)
-am__objects_48 = $(am__objects_47)
+@ENABLE_MODULES_FALSE@am__objects_52 = $(am__objects_51)
+am__objects_53 = $(am__objects_52)
 am_src_syncevo_local_sync_OBJECTS =  \
        src/src_syncevo_local_sync-syncevo-local-sync.$(OBJEXT) \
-       $(am__objects_48)
+       $(am__objects_53)
 @ENABLE_UNIT_TESTS_TRUE@nodist_src_syncevo_local_sync_OBJECTS = test/src_syncevo_local_sync-test.$(OBJEXT)
 src_syncevo_local_sync_OBJECTS = $(am_src_syncevo_local_sync_OBJECTS) \
        $(nodist_src_syncevo_local_sync_OBJECTS)
@@ -1832,7 +1861,6 @@ src_syncevo_local_sync_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
        $(src_syncevo_local_sync_LDFLAGS) $(LDFLAGS) -o $@
 am__src_syncevolution_SOURCES_DIST = src/syncevolution.cpp \
        src/backends/activesync/ActiveSyncSourceRegister.cpp \
-       src/backends/addressbook/AddressBookSourceRegister.cpp \
        src/backends/akonadi/AkonadiSyncSourceRegister.cpp \
        src/backends/evolution/EvolutionCalendarSourceRegister.cpp \
        src/backends/evolution/EvolutionContactSourceRegister.cpp \
@@ -1842,14 +1870,14 @@ am__src_syncevolution_SOURCES_DIST = src/syncevolution.cpp \
        src/backends/kcalextended/KCalExtendedSourceRegister.cpp \
        src/backends/kde/KDEPlatformRegister.cpp \
        src/backends/maemo/MaemoCalendarSourceRegister.cpp \
+       src/backends/oauth2/oauth2Register.cpp \
        src/backends/pbap/PbapSyncSourceRegister.cpp \
        src/backends/qtcontacts/QtContactsSourceRegister.cpp \
        src/backends/signon/signonRegister.cpp \
        src/backends/sqlite/SQLiteContactSourceRegister.cpp \
        src/backends/webdav/WebDAVSourceRegister.cpp \
        src/backends/xmlrpc/XMLRPCSyncSourceRegister.cpp
-@COND_CORE_TRUE@am__objects_49 = src/backends/activesync/src_syncevolution-ActiveSyncSourceRegister.$(OBJEXT) \
-@COND_CORE_TRUE@       src/backends/addressbook/src_syncevolution-AddressBookSourceRegister.$(OBJEXT) \
+@COND_CORE_TRUE@am__objects_54 = src/backends/activesync/src_syncevolution-ActiveSyncSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/akonadi/src_syncevolution-AkonadiSyncSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/evolution/src_syncevolution-EvolutionCalendarSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/evolution/src_syncevolution-EvolutionContactSourceRegister.$(OBJEXT) \
@@ -1859,17 +1887,18 @@ am__src_syncevolution_SOURCES_DIST = src/syncevolution.cpp \
 @COND_CORE_TRUE@       src/backends/kcalextended/src_syncevolution-KCalExtendedSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/kde/src_syncevolution-KDEPlatformRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/maemo/src_syncevolution-MaemoCalendarSourceRegister.$(OBJEXT) \
+@COND_CORE_TRUE@       src/backends/oauth2/src_syncevolution-oauth2Register.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/pbap/src_syncevolution-PbapSyncSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/qtcontacts/src_syncevolution-QtContactsSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/signon/src_syncevolution-signonRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/sqlite/src_syncevolution-SQLiteContactSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/webdav/src_syncevolution-WebDAVSourceRegister.$(OBJEXT) \
 @COND_CORE_TRUE@       src/backends/xmlrpc/src_syncevolution-XMLRPCSyncSourceRegister.$(OBJEXT)
-@ENABLE_MODULES_FALSE@am__objects_50 = $(am__objects_49)
-am__objects_51 = $(am__objects_50)
+@ENABLE_MODULES_FALSE@am__objects_55 = $(am__objects_54)
+am__objects_56 = $(am__objects_55)
 am_src_syncevolution_OBJECTS =  \
        src/src_syncevolution-syncevolution.$(OBJEXT) \
-       $(am__objects_51)
+       $(am__objects_56)
 @ENABLE_UNIT_TESTS_TRUE@nodist_src_syncevolution_OBJECTS =  \
 @ENABLE_UNIT_TESTS_TRUE@       test/src_syncevolution-test.$(OBJEXT)
 src_syncevolution_OBJECTS = $(am_src_syncevolution_OBJECTS) \
@@ -1880,9 +1909,9 @@ src_syncevolution_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
        $(src_syncevolution_LDFLAGS) $(LDFLAGS) -o $@
 am__test_dbus_client_server_SOURCES_DIST =  \
        test/dbus-client-server.cpp test/test.cpp
-@COND_CORE_TRUE@@COND_DBUS_TRUE@@ENABLE_UNIT_TESTS_TRUE@am__objects_52 = test/test_dbus_client_server-test.$(OBJEXT)
+@COND_CORE_TRUE@@COND_DBUS_TRUE@@ENABLE_UNIT_TESTS_TRUE@am__objects_57 = test/test_dbus_client_server-test.$(OBJEXT)
 @COND_CORE_TRUE@@COND_DBUS_TRUE@am_test_dbus_client_server_OBJECTS = test/test_dbus_client_server-dbus-client-server.$(OBJEXT) \
-@COND_CORE_TRUE@@COND_DBUS_TRUE@       $(am__objects_52)
+@COND_CORE_TRUE@@COND_DBUS_TRUE@       $(am__objects_57)
 test_dbus_client_server_OBJECTS =  \
        $(am_test_dbus_client_server_OBJECTS)
 test_dbus_client_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
@@ -1943,7 +1972,6 @@ AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(src_backends_activesync_syncactivesync_la_SOURCES) \
-       $(src_backends_addressbook_syncaddressbook_la_SOURCES) \
        $(src_backends_akonadi_syncakonadi_la_SOURCES) \
        $(src_backends_evolution_syncebook_la_SOURCES) \
        $(src_backends_evolution_syncecal_la_SOURCES) \
@@ -1953,9 +1981,11 @@ SOURCES = $(src_backends_activesync_syncactivesync_la_SOURCES) \
        $(src_backends_kcalextended_synckcalextended_la_SOURCES) \
        $(src_backends_kde_platformkde_la_SOURCES) \
        $(src_backends_maemo_syncmaemocal_la_SOURCES) \
+       $(src_backends_oauth2_provideroauth2_la_SOURCES) \
        $(src_backends_pbap_syncpbap_la_SOURCES) \
        $(src_backends_qtcontacts_syncqtcontacts_la_SOURCES) \
        $(src_backends_signon_providergsso_la_SOURCES) \
+       $(src_backends_signon_providersignon_la_SOURCES) \
        $(src_backends_signon_provideruoa_la_SOURCES) \
        $(src_backends_sqlite_syncsqlite_la_SOURCES) \
        $(src_backends_webdav_syncdav_la_SOURCES) \
@@ -1975,8 +2005,7 @@ SOURCES = $(src_backends_activesync_syncactivesync_la_SOURCES) \
        $(src_abort_redirect_SOURCES) $(src_client_test_SOURCES) \
        $(nodist_src_client_test_SOURCES) \
        $(src_dbus_glib_test_syncevo_dbus_SOURCES) \
-       $(src_gdbus_example_SOURCES) $(src_gdbusxx_example_SOURCES) \
-       $(src_gtk_ui_sync_ui_SOURCES) \
+       $(src_gdbus_example_SOURCES) $(src_gtk_ui_sync_ui_SOURCES) \
        $(src_gtk_ui_sync_ui_gtk_SOURCES) \
        $(src_gtk_ui_sync_ui_moblin_SOURCES) \
        $(src_gtk3_ui_sync_ui_SOURCES) \
@@ -1993,7 +2022,6 @@ SOURCES = $(src_backends_activesync_syncactivesync_la_SOURCES) \
        $(test_dbus_client_server_SOURCES)
 DIST_SOURCES =  \
        $(am__src_backends_activesync_syncactivesync_la_SOURCES_DIST) \
-       $(am__src_backends_addressbook_syncaddressbook_la_SOURCES_DIST) \
        $(am__src_backends_akonadi_syncakonadi_la_SOURCES_DIST) \
        $(am__src_backends_evolution_syncebook_la_SOURCES_DIST) \
        $(am__src_backends_evolution_syncecal_la_SOURCES_DIST) \
@@ -2003,9 +2031,11 @@ DIST_SOURCES =  \
        $(am__src_backends_kcalextended_synckcalextended_la_SOURCES_DIST) \
        $(am__src_backends_kde_platformkde_la_SOURCES_DIST) \
        $(am__src_backends_maemo_syncmaemocal_la_SOURCES_DIST) \
+       $(am__src_backends_oauth2_provideroauth2_la_SOURCES_DIST) \
        $(am__src_backends_pbap_syncpbap_la_SOURCES_DIST) \
        $(am__src_backends_qtcontacts_syncqtcontacts_la_SOURCES_DIST) \
        $(am__src_backends_signon_providergsso_la_SOURCES_DIST) \
+       $(am__src_backends_signon_providersignon_la_SOURCES_DIST) \
        $(am__src_backends_signon_provideruoa_la_SOURCES_DIST) \
        $(am__src_backends_sqlite_syncsqlite_la_SOURCES_DIST) \
        $(am__src_backends_webdav_syncdav_la_SOURCES_DIST) \
@@ -2022,7 +2052,6 @@ DIST_SOURCES =  \
        $(am__src_client_test_SOURCES_DIST) \
        $(am__src_dbus_glib_test_syncevo_dbus_SOURCES_DIST) \
        $(am__src_gdbus_example_SOURCES_DIST) \
-       $(am__src_gdbusxx_example_SOURCES_DIST) \
        $(am__src_gtk_ui_sync_ui_SOURCES_DIST) \
        $(am__src_gtk_ui_sync_ui_gtk_SOURCES_DIST) \
        $(am__src_gtk_ui_sync_ui_moblin_SOURCES_DIST) \
@@ -2059,7 +2088,6 @@ am__dist_noinst_DATA_DIST = src/gdbus/README \
        src/syncevo/configs/README src/syncevo/syncevolution.pc.in \
        src/backends/activesync/configure-sub.in \
        src/backends/activesync/README \
-       src/backends/addressbook/configure-sub.in \
        src/backends/akonadi/configure-sub.in \
        src/backends/akonadi/README \
        src/backends/evolution/configure-sub.in \
@@ -2069,7 +2097,9 @@ am__dist_noinst_DATA_DIST = src/gdbus/README \
        src/backends/kcalextended/configure-sub.in \
        src/backends/kde/configure-sub.in \
        src/backends/maemo/configure-sub.in \
-       src/backends/pbap/configure-sub.in src/backends/pbap/README \
+       src/backends/oauth2/configure-sub.in \
+       src/backends/oauth2/README src/backends/pbap/configure-sub.in \
+       src/backends/pbap/README \
        src/backends/qtcontacts/configure-sub.in \
        src/backends/signon/configure-sub.in \
        src/backends/signon/README \
@@ -2099,7 +2129,6 @@ am__dist_noinst_DATA_DIST = src/gdbus/README \
        src/shlibs.local src/synthesis-includes/Makefile.am \
        src/synthesis-includes/Makefile.in \
        src/backends/activesync/ActiveSyncSourceRegister.cpp \
-       src/backends/addressbook/AddressBookSourceRegister.cpp \
        src/backends/akonadi/AkonadiSyncSourceRegister.cpp \
        src/backends/evolution/EvolutionCalendarSourceRegister.cpp \
        src/backends/evolution/EvolutionContactSourceRegister.cpp \
@@ -2109,6 +2138,7 @@ am__dist_noinst_DATA_DIST = src/gdbus/README \
        src/backends/kcalextended/KCalExtendedSourceRegister.cpp \
        src/backends/kde/KDEPlatformRegister.cpp \
        src/backends/maemo/MaemoCalendarSourceRegister.cpp \
+       src/backends/oauth2/oauth2Register.cpp \
        src/backends/pbap/PbapSyncSourceRegister.cpp \
        src/backends/qtcontacts/QtContactsSourceRegister.cpp \
        src/backends/signon/signonRegister.cpp \
@@ -2117,18 +2147,46 @@ am__dist_noinst_DATA_DIST = src/gdbus/README \
        test/abort-redirect.cpp test/ClientTest.h \
        test/ClientTestAssert.h test/ClientTest.cpp \
        test/client-test-main.cpp test/test.h test/test.cpp \
-       test/COPYING test/Algorithm/Artistic test/Algorithm/COPYING \
-       test/Algorithm/README test/testcases/eds_event.ics \
+       test/testcases/eds_event.ics \
        test/testcases/eds_event.ics.local test/testcases/eds_task.ics \
-       test/testcases/vcal10.ics test/testcases/eds_contact.vcf \
-       test/testcases/eds_memo.ics test/testcases/google_event.ics \
+       test/testcases/vcal10.ics test/testcases/carddav.vcf \
+       test/testcases/eds_contact.vcf test/testcases/eds_memo.ics \
+       test/testcases/google_event.ics \
        test/testcases/yahoo_contact.vcf test/testcases/lcs/file1.txt \
        test/testcases/lcs/file2.txt test/testcases/local.png \
        test/testcases/templates/clients/phone/nokia/S40/7210c.ini \
        test/testcases/templates/clients/SyncEvolution.ini \
-       test/syncevo-http-server-logging.conf $(wildcard \
-       test/testcases/*.patch) HACKING LICENSE.txt LICENSE.LGPL-21 \
-       README.rst description autogen.sh Doxyfile po/LINGUAS.README
+       test/testcases/synctests/apple/eds_contact/testUpload/local-synced \
+       test/testcases/synctests/apple/eds_contact/testUpload/local \
+       test/testcases/synctests/apple/eds_contact/testUpload/modify-remote \
+       test/testcases/synctests/apple/eds_contact/testUpload/remote \
+       test/testcases/synctests/apple/eds_contact/testDownload/modify-local \
+       test/testcases/synctests/apple/eds_contact/testDownload/local \
+       test/testcases/synctests/apple/eds_contact/testDownload/remote \
+       test/testcases/synctests/apple/eds_contact/testDownload/remote-synced \
+       test/testcases/synctests/googlecontacts/eds_contact/testUpload/local-synced \
+       test/testcases/synctests/googlecontacts/eds_contact/testUpload/local \
+       test/testcases/synctests/googlecontacts/eds_contact/testUpload/modify-remote \
+       test/testcases/synctests/googlecontacts/eds_contact/testUpload/remote \
+       test/testcases/synctests/googlecontacts/eds_contact/testDownload/modify-local \
+       test/testcases/synctests/googlecontacts/eds_contact/testDownload/local \
+       test/testcases/synctests/googlecontacts/eds_contact/testDownload/remote \
+       test/testcases/synctests/googlecontacts/eds_contact/testDownload/remote-synced \
+       test/testcases/synctests/googlecontacts/eds_contact/testUpdateRemoteWins/modify-local \
+       test/testcases/synctests/googlecontacts/eds_contact/testUpdateRemoteWins/local-synced \
+       test/testcases/synctests/googlecontacts/eds_contact/testUpdateRemoteWins/local \
+       test/testcases/synctests/googlecontacts/eds_contact/testUpdateRemoteWins/modify-remote \
+       test/testcases/synctests/googlecontacts/eds_contact/testUpdateRemoteWins/remote-synced \
+       test/testcases/synctests/googlecontacts/eds_contact/testUpdateLocalWins/modify-local \
+       test/testcases/synctests/googlecontacts/eds_contact/testUpdateLocalWins/local-synced \
+       test/testcases/synctests/googlecontacts/eds_contact/testUpdateLocalWins/local \
+       test/testcases/synctests/googlecontacts/eds_contact/testUpdateLocalWins/modify-remote \
+       test/testcases/synctests/googlecontacts/eds_contact/testUpdateLocalWins/remote-synced \
+       test/COPYING test/Algorithm/Artistic test/Algorithm/COPYING \
+       test/Algorithm/README test/syncevo-http-server-logging.conf \
+       $(wildcard test/testcases/*.patch) HACKING LICENSE.txt \
+       LICENSE.LGPL-21 README.rst description autogen.sh Doxyfile \
+       po/LINGUAS.README
 am__dist_pkgdata_DATA_DIST = src/dbus/server/bluetooth_products.ini
 am__dist_src_gtk3_ui_icon_DATA_DIST = src/gtk3-ui/sync.png
 am__dist_src_gtk3_ui_themerc_DATA_DIST = src/gtk3-ui/sync-generic.png \
@@ -2176,11 +2234,7 @@ am__dist_src_templates_contexts_DATA_DIST = $(subst \
        $(srcdir)/src/templates/contexts/*.ini))
 am__dist_src_templates_servers_DATA_DIST = $(subst \
        $(srcdir)/,,$(wildcard $(srcdir)/src/templates/servers/*.ini))
-am__dist_src_testcases_DATA_DIST = src/testcases/local.png \
-       src/testcases/google_event.ics src/testcases/yahoo_contact.vcf \
-       src/testcases/eds_contact.vcf src/testcases/eds_event.ics \
-       src/testcases/eds_event.ics.local src/testcases/eds_memo.ics \
-       src/testcases/eds_task.ics $(subst .patch,,$(subst \
+am__dist_src_testcases_DATA_DIST = $(subst .patch,,$(subst \
        $(top_srcdir)/test/,src/,$(TEST_FILES_PATCHES)))
 am__dist_src_testcases_lcs_DATA_DIST = src/testcases/lcs/file1.txt \
        src/testcases/lcs/file2.txt
@@ -2230,9 +2284,10 @@ am__src_syncevo_libsyncevolution_include_HEADERS_DIST =  \
        src/syncevo/ThreadSupport.h src/syncevo/TrackingSyncSource.h \
        src/syncevo/MapSyncSource.h src/syncevo/LogRedirect.h \
        src/syncevo/LogStdout.h src/syncevo/LogSyslog.h \
-       src/syncevo/FilterConfigNode.h src/syncevo/PrefixConfigNode.h \
-       src/syncevo/SafeConfigNode.h src/syncevo/SyncConfig.h \
-       src/syncevo/SyncSource.h src/syncevo/IdentityProvider.h \
+       src/syncevo/Exception.h src/syncevo/FilterConfigNode.h \
+       src/syncevo/PrefixConfigNode.h src/syncevo/SafeConfigNode.h \
+       src/syncevo/SyncConfig.h src/syncevo/SyncSource.h \
+       src/syncevo/IdentityProvider.h src/syncevo/GuardFD.h \
        src/syncevo/util.h src/syncevo/BoostHelper.h \
        src/syncevo/SuspendFlags.h src/syncevo/SyncContext.h \
        src/syncevo/Timespec.h src/syncevo/UserInterface.h \
@@ -2292,9 +2347,9 @@ distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
+ACCOUNTS_CFLAGS = @ACCOUNTS_CFLAGS@
+ACCOUNTS_LIBS = @ACCOUNTS_LIBS@
 ACLOCAL = @ACLOCAL@
-ADDRESSBOOK_CFLAGS = @ADDRESSBOOK_CFLAGS@
-ADDRESSBOOK_LIBS = @ADDRESSBOOK_LIBS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -2340,6 +2395,7 @@ DBUS_PIM_PLUGIN_CFLAGS = @DBUS_PIM_PLUGIN_CFLAGS@
 DBUS_PIM_PLUGIN_LDFLAGS = @DBUS_PIM_PLUGIN_LDFLAGS@
 DBUS_PIM_PLUGIN_LIBS = @DBUS_PIM_PLUGIN_LIBS@
 DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
+DEFAULT_SIGNON = @DEFAULT_SIGNON@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -2371,6 +2427,8 @@ FILE_LIBS = @FILE_LIBS@
 FOLKS_CFLAGS = @FOLKS_CFLAGS@
 FOLKS_LIBS = @FOLKS_LIBS@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOUNIX_CFLAGS = @GIOUNIX_CFLAGS@
+GIOUNIX_LIBS = @GIOUNIX_LIBS@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
 GLIB216_CFLAGS = @GLIB216_CFLAGS@
@@ -2421,6 +2479,8 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+JSON_CFLAGS = @JSON_CFLAGS@
+JSON_LIBS = @JSON_LIBS@
 KCALEXTENDED_CFLAGS = @KCALEXTENDED_CFLAGS@
 KCALEXTENDED_LIBS = @KCALEXTENDED_LIBS@
 KDE4_CONFIG = @KDE4_CONFIG@
@@ -2523,7 +2583,7 @@ STABLE_VERSION = @STABLE_VERSION@
 STRIP = @STRIP@
 SYNCEVOLUTION_CFLAGS = @SYNCEVOLUTION_CFLAGS@
 SYNCEVOLUTION_CXXFLAGS = @SYNCEVOLUTION_CXXFLAGS@
-SYNCEVOLUTION_LDADD = @SYNCEVOLUTION_LDADD@ $(am__append_86)
+SYNCEVOLUTION_LDADD = @SYNCEVOLUTION_LDADD@ $(am__append_92)
 SYNCEVOLUTION_LIBS = @SYNCEVOLUTION_LIBS@
 SYNCEVOLUTION_LOCALEDIR = @SYNCEVOLUTION_LOCALEDIR@
 SYNCEVO_DBUS_SERVER_ARGS = @SYNCEVO_DBUS_SERVER_ARGS@
@@ -2613,65 +2673,65 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # clean variables
-CLEANFILES = $(am__append_26) $(src_dbus_interfaces_built_sources) \
-       src/dbus/interfaces/.stamp $(NONE) $(am__append_54) \
-       $(am__append_59) $(am__append_72) $(am__append_80) \
-       $(am__append_84) src/libstdc++.a src/client-test \
+CLEANFILES = $(am__append_28) $(src_dbus_interfaces_built_sources) \
+       src/dbus/interfaces/.stamp $(NONE) $(am__append_59) \
+       $(am__append_64) $(am__append_77) $(am__append_86) \
+       $(am__append_90) src/libstdc++.a src/client-test \
        $(CLIENT_LIB_TEST_FILES) src/syncevo-http-server \
        src/syncevo-phone-config src/synclog2html \
        src/ClientTest.cpp.html src/abort-redirect.log \
        README.patched.rst syncevolution.1 README README.html
-DISTCLEANFILES = $(am__append_25) $(am__append_49) $(am__append_60) \
+DISTCLEANFILES = $(am__append_27) $(am__append_54) $(am__append_65) \
        src/synccompare src/synthesis-includes/Makefile
-MAINTAINERCLEANFILES = $(am__append_6) $(am__append_58) Makefile.in \
+MAINTAINERCLEANFILES = $(am__append_6) $(am__append_63) Makefile.in \
        config.h.in config.guess config.sub configure depcomp \
        install-sh ltmain.sh missing mkinstalldirs
-MOSTLYCLEANFILES = $(am__append_33) $(am__append_57)
+MOSTLYCLEANFILES = $(am__append_35) $(am__append_62)
 
 # standard arch dependent pkg-config dir
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(am__append_24) $(am__append_51) $(am__append_62)
+pkgconfig_DATA = $(am__append_26) $(am__append_56) $(am__append_67)
 
 # Install test suite (client-test, test-dbus.py, testpim.py, etc.).
 testparentdir = $(libdir)/syncevolution
 # Must end in "/test" so that we can use nobase_testparent_DATA=test/...
 testdir = $(testparentdir)/test
-test_DATA = $(am__append_104)
+test_DATA = $(am__append_112)
 nobase_test_DATA = 
-test_SCRIPTS = $(am__append_75) $(am__append_101)
-nobase_testparent_DATA = $(am__append_105)
+test_SCRIPTS = $(am__append_80) $(am__append_81) $(am__append_109)
+nobase_testparent_DATA = $(am__append_113)
 
 # standard variables with standard prefixes
-dist_doc_DATA = $(am__append_109)
-dist_noinst_DATA = $(am__append_9) $(am__append_14) \
+dist_doc_DATA = $(am__append_117)
+dist_noinst_DATA = $(am__append_8) $(am__append_13) \
        src/dbus/interfaces/spec-strip-docs.xsl \
        src/dbus/interfaces/spec-to-docbook.xsl \
        src/dbus/interfaces/syncevo-connection-full.xml \
        src/dbus/interfaces/syncevo-server-full.xml \
        src/dbus/interfaces/syncevo-session-full.xml \
-       src/dbus/interfaces/README $(am__append_50) $(am__append_61) \
-       $(am__append_76) $(am__append_77) $(am__append_81) \
+       src/dbus/interfaces/README $(am__append_55) $(am__append_66) \
+       $(am__append_82) $(am__append_83) $(am__append_87) \
        src/shlibs.local src/synthesis-includes/Makefile.am \
-       src/synthesis-includes/Makefile.in $(am__append_88) \
-       $(am__append_98) HACKING LICENSE.txt LICENSE.LGPL-21 \
+       src/synthesis-includes/Makefile.in $(am__append_94) \
+       $(am__append_106) HACKING LICENSE.txt LICENSE.LGPL-21 \
        README.rst description autogen.sh Doxyfile po/LINGUAS.README
-dist_pkgdata_DATA = $(am__append_64)
-doc_DATA = $(am__append_47) $(am__append_111)
+dist_pkgdata_DATA = $(am__append_69)
+doc_DATA = $(am__append_52) $(am__append_119)
 
 # generate syntax-highlighted version of ClientTest.cpp for HTML
 # version of .log test results
 nodist_noinst_DATA = src/ClientTest.cpp.html
-lib_LTLIBRARIES = $(am__append_4) $(am__append_10) $(am__append_17) \
-       $(am__append_48) $(am__append_55)
-noinst_LTLIBRARIES = $(am__append_5) $(am__append_11) $(am__append_34) \
-       $(am__append_63)
+lib_LTLIBRARIES = $(am__append_4) $(am__append_9) $(am__append_16) \
+       $(am__append_53) $(am__append_60)
+noinst_LTLIBRARIES = $(am__append_5) $(am__append_10) $(am__append_36) \
+       $(am__append_68)
 
 # helper script for testing
-bin_SCRIPTS = $(am__append_42) src/synclog2html
+bin_SCRIPTS = $(am__append_47) src/synclog2html
 dist_noinst_SCRIPTS = build/gen-git-version.sh build/source2html.py \
-       $(am__append_30)
-libexec_SCRIPTS = $(am__append_73)
-nodist_bin_SCRIPTS = $(am__append_85) src/syncevo-phone-config
+       $(am__append_32)
+libexec_SCRIPTS = $(am__append_78)
+nodist_bin_SCRIPTS = $(am__append_91) src/syncevo-phone-config
 
 # other
 
@@ -2684,16 +2744,17 @@ nodist_bin_SCRIPTS = $(am__append_85) src/syncevo-phone-config
 # found in a parent directory. However, these files are needed
 # later on during the recursive libsynthesis configure+make.
 all_dist_hooks = src_dist_hook dot_dist_hook
-all_install_exec_hooks = $(am__append_102)
-all_uninstall_hooks = $(am__append_103)
+all_install_exec_hooks = $(am__append_110)
+all_uninstall_hooks = $(am__append_111)
 
 # Check that no executable or shared object depends on symbols in
 # libraries that it does not link against. Unnecessarily linking
 # against libs is okay, that can be caught and fixed by
 # -Wl,--as-needed. Depends on dpkg-shlibdeps, skipped if that is
 # not available.
-all_local_installchecks = $(am__append_31) $(am__append_43) \
-       $(am__append_113) toplevel_link_check
+all_local_installchecks = $(am__append_33) $(am__append_48) \
+       $(am__append_121) toplevel_link_check
+
 # These dependencies are intentionally a bit too broad:
 # they ensure that all files are in place to *run* client-test.
 
@@ -2732,11 +2793,11 @@ all_local_installchecks = $(am__append_31) $(am__append_43) \
 # Build "html" inside the build dir, using source files
 # from the SyncEvolution source directory and (if built)
 # the installed client-api.build directory.
-all_phonies = $(am__append_28) $(TEST_FILES_GENERATED) testcase2patch \
+all_phonies = $(am__append_30) $(TEST_FILES_GENERATED) testcase2patch \
        src/templates test valgrind checkinstall/dist/$(distdir) \
        clean_dist doc clean-html
-BUILT_SOURCES = $(am__append_29) $(src_dbus_interfaces_built_sources) \
-       $(am__append_53) $(am__append_56)
+BUILT_SOURCES = $(am__append_31) $(src_dbus_interfaces_built_sources) \
+       $(am__append_58) $(am__append_61)
 DIST_SUBDIRS = po
 EXTRA_DIST = build/export-foreign-git.sh build/export-gdbus.sh \
        build/export-synthesis-xml.sh build/gen-backends-am.sh \
@@ -2751,8 +2812,8 @@ EXTRA_DIST = build/export-foreign-git.sh build/export-gdbus.sh \
        src/dbus/server/pim/test-dbus/db-active/config/syncevolution/pim-manager.ini \
        src/dbus/server/pim/test-dbus/simple-sort/config/syncevolution/pim-manager.ini \
        src/dbus/server/pim/test-dbus/first-last-sort/config/syncevolution/pim-manager.ini \
-       $(am__append_71) src/gtk-ui/ui.xml src/gtk3-ui/ui.xml
-SUBDIRS = $(am__append_1) $(am__append_2) . $(am__append_106)
+       $(am__append_76) src/gtk-ui/ui.xml src/gtk3-ui/ui.xml
+SUBDIRS = $(am__append_1) $(am__append_2) . $(am__append_114)
 AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS = -I m4 -I m4-repo ${ACLOCAL_FLAGS}
 @COND_GIO_GDBUS_FALSE@gdbus_dir = $(top_srcdir)/src/gdbus
@@ -2761,11 +2822,11 @@ ACLOCAL_AMFLAGS = -I m4 -I m4-repo ${ACLOCAL_FLAGS}
 @COND_GIO_GDBUS_TRUE@gdbus_dir = $(top_srcdir)/src/gdbusxx
 @COND_GIO_GDBUS_FALSE@gdbus_build_dir = src/gdbus
 @COND_GIO_GDBUS_TRUE@gdbus_build_dir = src/gdbusxx
-disted_docs = $(am__append_107)
-distbin_docs = $(am__append_108) $(am__append_110)
-man_MANS = $(am__append_112)
-src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
-       $(am__append_13) $(am__append_32) $(am__append_46) \
+disted_docs = $(am__append_115)
+distbin_docs = $(am__append_116) $(am__append_118)
+man_MANS = $(am__append_120)
+src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_7) \
+       $(am__append_12) $(am__append_34) $(am__append_51) \
        -I$(top_srcdir)/src/dbus -I$(top_srcdir)/test -I$(top_srcdir) \
        $(BACKEND_CPPFLAGS)
 @ENABLE_GNOME_BLUETOOTH_PANEL_TRUE@src_gnome_bluetoothdir = $(GNOMEBLUETOOTH_DIR)/plugins/
@@ -2787,11 +2848,7 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_GIO_GDBUS_TRUE@src_gdbusxx_libgdbussyncevo_la_LDFLAGS = $(src_gdbus_version_info)
 @COND_GIO_GDBUS_TRUE@src_gdbusxx_libgdbussyncevo_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS)
 @COND_GIO_GDBUS_TRUE@src_gdbusxx_libgdbussyncevo_la_CXXFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(SYNCEVO_WFLAGS)
-@COND_GIO_GDBUS_TRUE@src_gdbusxx_libgdbussyncevo_la_CPPFLAGS = $(BOOST_CPPFLAGS)
-@COND_GIO_GDBUS_TRUE@src_gdbusxx_example_SOURCES = src/gdbusxx/test/example.cpp
-@COND_GIO_GDBUS_TRUE@src_gdbusxx_example_CPPFLAGS = -I$(top_srcdir)/src/gdbusxx/ $(BOOST_CPPFLAGS)
-@COND_GIO_GDBUS_TRUE@src_gdbusxx_example_CXXFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(SYNCEVO_WFLAGS)
-@COND_GIO_GDBUS_TRUE@src_gdbusxx_example_LDADD = src/gdbusxx/libgdbussyncevo.la $(GLIB_LIBS) $(DBUS_LIBS)
+@COND_GIO_GDBUS_TRUE@src_gdbusxx_libgdbussyncevo_la_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir)/src/ # allow access to libsyncevolution utility code
 @COND_GIO_GDBUS_FALSE@@ENABLE_MODULES_TRUE@src_gdbus_version_info = -version-info 0:0:0
 @COND_GIO_GDBUS_FALSE@src_gdbus_libgdbussyncevo_la_SOURCES = \
 @COND_GIO_GDBUS_FALSE@  src/gdbus/debug.h \
@@ -2851,15 +2908,15 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 # applies to sources in SyncEvolution repository, but not
 # the Funambol C++ client library
 @COND_CORE_TRUE@src_syncevo_cxxflags = @SYNCEVOLUTION_CXXFLAGS@ \
-@COND_CORE_TRUE@       $(am__append_15) $(am__append_21) \
-@COND_CORE_TRUE@       $(am__append_23)
+@COND_CORE_TRUE@       $(am__append_14) $(am__append_23) \
+@COND_CORE_TRUE@       $(am__append_25)
 @COND_CORE_TRUE@src_syncevo_cppflags = @BACKEND_CPPFLAGS@ @GLIB_CFLAGS@ -I$(top_srcdir)/test -I$(gdbus_dir) $(DBUS_CFLAGS) -I$(top_builddir)/src/syncevo -I$(top_srcdir)/src -DSYNCEVO_LIBEXEC=\"$(libexecdir)\" -DSYNCEVO_BACKEND=\"$(BACKENDS_SEARCH_DIRECTORY)\"
 
 # needed in all cases
 @COND_CORE_TRUE@src_syncevo_ldadd = @SYNCEVOLUTION_LDADD@ \
 @COND_CORE_TRUE@       $(gdbus_build_dir)/libgdbussyncevo.la \
-@COND_CORE_TRUE@       $(am__append_16) $(am__append_20) \
-@COND_CORE_TRUE@       $(am__append_22)
+@COND_CORE_TRUE@       $(am__append_15) $(am__append_20) \
+@COND_CORE_TRUE@       $(am__append_22) $(am__append_24)
 @COND_CORE_TRUE@src_syncevo_sources = src/syncevo/GeeSupport.h \
 @COND_CORE_TRUE@       src/syncevo/GValueSupport.h \
 @COND_CORE_TRUE@       src/syncevo/EDSClient.h \
@@ -2880,6 +2937,8 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_CORE_TRUE@       src/syncevo/eds_abi_wrapper.cpp \
 @COND_CORE_TRUE@       src/syncevo/GLibSupport.h \
 @COND_CORE_TRUE@       src/syncevo/GLibSupport.cpp \
+@COND_CORE_TRUE@       src/syncevo/GVariantSupport.h \
+@COND_CORE_TRUE@       src/syncevo/GVariantSupport.cpp \
 @COND_CORE_TRUE@       src/syncevo/ThreadSupport.h \
 @COND_CORE_TRUE@       src/syncevo/SyncML.h src/syncevo/SyncML.cpp \
 @COND_CORE_TRUE@       src/syncevo/SynthesisEngine.h \
@@ -2900,11 +2959,13 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_CORE_TRUE@       src/syncevo/SoupTransportAgent.cpp \
 @COND_CORE_TRUE@       src/syncevo/LocalTransportAgent.h \
 @COND_CORE_TRUE@       src/syncevo/LocalTransportAgent.cpp \
-@COND_CORE_TRUE@       src/syncevo/util.cpp src/syncevo/util.h \
-@COND_CORE_TRUE@       src/syncevo/BoostHelper.h \
-@COND_CORE_TRUE@       src/syncevo/TmpFile.cpp src/syncevo/TmpFile.h \
-@COND_CORE_TRUE@       src/syncevo/Timespec.h src/syncevo/lcs.h \
-@COND_CORE_TRUE@       src/syncevo/lcs.cpp src/syncevo/ForkExec.cpp \
+@COND_CORE_TRUE@       src/syncevo/Exception.h \
+@COND_CORE_TRUE@       src/syncevo/Exception.cpp src/syncevo/util.cpp \
+@COND_CORE_TRUE@       src/syncevo/util.h src/syncevo/BoostHelper.h \
+@COND_CORE_TRUE@       src/syncevo/GuardFD.h src/syncevo/TmpFile.cpp \
+@COND_CORE_TRUE@       src/syncevo/TmpFile.h src/syncevo/Timespec.h \
+@COND_CORE_TRUE@       src/syncevo/lcs.h src/syncevo/lcs.cpp \
+@COND_CORE_TRUE@       src/syncevo/ForkExec.cpp \
 @COND_CORE_TRUE@       src/syncevo/ForkExec.h src/syncevo/Cmdline.cpp \
 @COND_CORE_TRUE@       src/syncevo/Cmdline.h \
 @COND_CORE_TRUE@       src/syncevo/CmdlineSyncClient.h \
@@ -2946,7 +3007,8 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_CORE_TRUE@       src/syncevo/MapSyncSource.cpp \
 @COND_CORE_TRUE@       src/syncevo/TrackingSyncSource.h \
 @COND_CORE_TRUE@       src/syncevo/TrackingSyncSource.cpp \
-@COND_CORE_TRUE@       $(am__append_18) $(am__append_19)
+@COND_CORE_TRUE@       $(am__append_17) $(am__append_18) \
+@COND_CORE_TRUE@       $(am__append_19) $(am__append_21)
 @COND_CORE_TRUE@src_syncevo_libsyncevolution_includedir = $(includedir)/syncevo
 @COND_CORE_TRUE@src_syncevo_libsyncevolution_include_HEADERS = \
 @COND_CORE_TRUE@  src/syncevo/declarations.h \
@@ -2960,12 +3022,14 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_CORE_TRUE@  src/syncevo/LogStdout.h \
 @COND_CORE_TRUE@  src/syncevo/LogSyslog.h \
 @COND_CORE_TRUE@  \
+@COND_CORE_TRUE@  src/syncevo/Exception.h \
 @COND_CORE_TRUE@  src/syncevo/FilterConfigNode.h \
 @COND_CORE_TRUE@  src/syncevo/PrefixConfigNode.h \
 @COND_CORE_TRUE@  src/syncevo/SafeConfigNode.h \
 @COND_CORE_TRUE@  src/syncevo/SyncConfig.h \
 @COND_CORE_TRUE@  src/syncevo/SyncSource.h \
 @COND_CORE_TRUE@  src/syncevo/IdentityProvider.h \
+@COND_CORE_TRUE@  src/syncevo/GuardFD.h \
 @COND_CORE_TRUE@  src/syncevo/util.h \
 @COND_CORE_TRUE@  src/syncevo/BoostHelper.h \
 @COND_CORE_TRUE@  src/syncevo/SuspendFlags.h \
@@ -2983,11 +3047,13 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_CORE_TRUE@src_syncevo_libsyncevolution_la_SOURCES = $(src_syncevo_sources)
 @COND_CORE_TRUE@nodist_src_syncevo_libsyncevolution_la_SOURCES = src/syncevo/SyncEvolutionXML.c
 @COND_CORE_TRUE@src_syncevo_libsyncevolution_la_LIBADD = @GIO_LIBS@ \
-@COND_CORE_TRUE@       @GTHREAD_LIBS@ @GLIB_LIBS@ $(SYNTHESIS_LIBS) \
-@COND_CORE_TRUE@       $(PCRECPP_LIBS) $(TRANSPORT_LIBS) @LIBS@ \
-@COND_CORE_TRUE@       $(src_syncevo_ldadd) $(DLT_LIBS) $(DBUS_LIBS) \
-@COND_CORE_TRUE@       $(NSS_LIBS) $(am__append_27)
+@COND_CORE_TRUE@       $(GIOUNIX_LIBS) @GTHREAD_LIBS@ @GLIB_LIBS@ \
+@COND_CORE_TRUE@       $(SYNTHESIS_LIBS) $(PCRECPP_LIBS) \
+@COND_CORE_TRUE@       $(TRANSPORT_LIBS) @LIBS@ $(src_syncevo_ldadd) \
+@COND_CORE_TRUE@       $(DLT_LIBS) $(DBUS_LIBS) $(NSS_LIBS) \
+@COND_CORE_TRUE@       $(am__append_29)
 @COND_CORE_TRUE@src_syncevo_libsyncevolution_la_CXXFLAGS = \
+@COND_CORE_TRUE@  $(GIOUNIX_CFLAGS) \
 @COND_CORE_TRUE@  $(PCRECPP_CFLAGS) \
 @COND_CORE_TRUE@  $(TRANSPORT_CFLAGS) \
 @COND_CORE_TRUE@  $(src_syncevo_cxxflags) \
@@ -3013,8 +3079,8 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 
 # command which embeds its input lines into a C-style string that runs across multiple lines
 @COND_CORE_TRUE@TO_C_STRING = sed -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/'
-@COND_CORE_TRUE@BACKENDS = src/backends/activesync src/backends/addressbook src/backends/akonadi src/backends/evolution src/backends/file src/backends/gnome src/backends/goa src/backends/kcalextended src/backends/kde src/backends/maemo src/backends/pbap src/backends/qtcontacts src/backends/signon src/backends/sqlite src/backends/webdav src/backends/xmlrpc
-@COND_CORE_TRUE@BACKEND_REGISTRIES = src/backends/activesync/ActiveSyncSourceRegister.cpp src/backends/addressbook/AddressBookSourceRegister.cpp src/backends/akonadi/AkonadiSyncSourceRegister.cpp src/backends/evolution/EvolutionCalendarSourceRegister.cpp src/backends/evolution/EvolutionContactSourceRegister.cpp src/backends/file/FileSyncSourceRegister.cpp src/backends/gnome/GNOMEPlatformRegister.cpp src/backends/goa/GOARegister.cpp src/backends/kcalextended/KCalExtendedSourceRegister.cpp src/backends/kde/KDEPlatformRegister.cpp src/backends/maemo/MaemoCalendarSourceRegister.cpp src/backends/pbap/PbapSyncSourceRegister.cpp src/backends/qtcontacts/QtContactsSourceRegister.cpp src/backends/signon/signonRegister.cpp src/backends/sqlite/SQLiteContactSourceRegister.cpp src/backends/webdav/WebDAVSourceRegister.cpp src/backends/xmlrpc/XMLRPCSyncSourceRegister.cpp
+@COND_CORE_TRUE@BACKENDS = src/backends/activesync src/backends/akonadi src/backends/evolution src/backends/file src/backends/gnome src/backends/goa src/backends/kcalextended src/backends/kde src/backends/maemo src/backends/oauth2 src/backends/pbap src/backends/qtcontacts src/backends/signon src/backends/sqlite src/backends/webdav src/backends/xmlrpc
+@COND_CORE_TRUE@BACKEND_REGISTRIES = src/backends/activesync/ActiveSyncSourceRegister.cpp src/backends/akonadi/AkonadiSyncSourceRegister.cpp src/backends/evolution/EvolutionCalendarSourceRegister.cpp src/backends/evolution/EvolutionContactSourceRegister.cpp src/backends/file/FileSyncSourceRegister.cpp src/backends/gnome/GNOMEPlatformRegister.cpp src/backends/goa/GOARegister.cpp src/backends/kcalextended/KCalExtendedSourceRegister.cpp src/backends/kde/KDEPlatformRegister.cpp src/backends/maemo/MaemoCalendarSourceRegister.cpp src/backends/oauth2/oauth2Register.cpp src/backends/pbap/PbapSyncSourceRegister.cpp src/backends/qtcontacts/QtContactsSourceRegister.cpp src/backends/signon/signonRegister.cpp src/backends/sqlite/SQLiteContactSourceRegister.cpp src/backends/webdav/WebDAVSourceRegister.cpp src/backends/xmlrpc/XMLRPCSyncSourceRegister.cpp
 @COND_CORE_TRUE@src_backends_activesync_lib = src/backends/activesync/syncactivesync.la
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_activesync_backenddir = $(BACKENDS_DIRECTORY)
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_activesync_backend_LTLIBRARIES = $(src_backends_activesync_lib)
@@ -3030,20 +3096,6 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_CORE_TRUE@src_backends_activesync_syncactivesync_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
 @COND_CORE_TRUE@src_backends_activesync_syncactivesync_la_CXXFLAGS = $(EASCLIENT_CFLAGS) $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS) $(LIBICAL_CFLAGS) $(GLIB_CFLAGS) $(GOBJECT_CFLAGS)
 @COND_CORE_TRUE@src_backends_activesync_syncactivesync_la_DEPENDENCIES = src/syncevo/libsyncevolution.la $(EASCLIENT_DEPENDENCIES)
-@COND_CORE_TRUE@src_backends_addressbook_lib = src/backends/addressbook/syncaddressbook.la
-@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_addressbook_backenddir = $(BACKENDS_DIRECTORY)
-@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_addressbook_backend_LTLIBRARIES = $(src_backends_addressbook_lib)
-@COND_CORE_TRUE@src_backends_addressbook_src = \
-@COND_CORE_TRUE@  src/backends/addressbook/AddressBookSource.h \
-@COND_CORE_TRUE@  src/backends/addressbook/AddressBookConstants.cpp \
-@COND_CORE_TRUE@  src/backends/addressbook/AddressBookSource.cpp
-
-@COND_CORE_TRUE@src_backends_addressbook_syncaddressbook_la_SOURCES = $(src_backends_addressbook_src)
-@COND_CORE_TRUE@src_backends_addressbook_syncaddressbook_la_LIBADD = $(ADDRESSBOOK_LIBS) $(SYNCEVOLUTION_LIBS)
-@COND_CORE_TRUE@src_backends_addressbook_syncaddressbook_la_LDFLAGS = -module -avoid-version
-@COND_CORE_TRUE@src_backends_addressbook_syncaddressbook_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS)
-@COND_CORE_TRUE@src_backends_addressbook_syncaddressbook_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
-@COND_CORE_TRUE@src_backends_addressbook_syncaddressbook_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
 @COND_CORE_TRUE@src_backends_akonadi_lib = src/backends/akonadi/syncakonadi.la
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_akonadi_backenddir = $(BACKENDS_DIRECTORY)
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_akonadi_backend_LTLIBRARIES = $(src_backends_akonadi_lib)
@@ -3065,8 +3117,7 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_CORE_TRUE@       src/backends/evolution/EvolutionCalendarSource.h \
 @COND_CORE_TRUE@       src/backends/evolution/EvolutionMemoSource.h \
 @COND_CORE_TRUE@       src/backends/evolution/EvolutionCalendarSource.cpp \
-@COND_CORE_TRUE@       src/backends/evolution/EvolutionMemoSource.cpp \
-@COND_CORE_TRUE@       $(am__append_35)
+@COND_CORE_TRUE@       $(NOP) $(am__append_37)
 @COND_CORE_TRUE@src_backends_evolution_syncebook_src = \
 @COND_CORE_TRUE@  src/backends/evolution/EvolutionSyncSource.h \
 @COND_CORE_TRUE@  src/backends/evolution/EvolutionSyncSource.cpp \
@@ -3117,7 +3168,7 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_CORE_TRUE@src_backends_gnome_platformgnome_la_SOURCES =  \
 @COND_CORE_TRUE@       src/backends/gnome/GNOMEPlatform.h \
 @COND_CORE_TRUE@       src/backends/gnome/GNOMEPlatform.cpp \
-@COND_CORE_TRUE@       $(am__append_36)
+@COND_CORE_TRUE@       $(am__append_38)
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_gnome_backenddir = $(BACKENDS_DIRECTORY)
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_gnome_backend_LTLIBRARIES = $(src_backends_gnome_lib)
 @COND_CORE_TRUE@src_backends_gnome_platformgnome_la_LIBADD = $(KEYRING_LIBS) $(SYNCEVOLUTION_LIBS) 
@@ -3129,7 +3180,7 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_CORE_TRUE@src_backends_goa_providergoa_la_SOURCES =  \
 @COND_CORE_TRUE@       src/backends/goa/goa.h \
 @COND_CORE_TRUE@       src/backends/goa/goa.cpp $(NONE) \
-@COND_CORE_TRUE@       $(am__append_37)
+@COND_CORE_TRUE@       $(am__append_39)
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_goa_backenddir = $(BACKENDS_DIRECTORY)
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_goa_backend_LTLIBRARIES = $(src_backends_goa_lib)
 @COND_CORE_TRUE@src_backends_goa_providergoa_la_LIBADD = $(SYNCEVOLUTION_LIBS) $(gdbus_build_dir)/libgdbussyncevo.la $(DBUS_LIBS)
@@ -3153,7 +3204,7 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_CORE_TRUE@src_backends_kde_platformkde_la_SOURCES =  \
 @COND_CORE_TRUE@       src/backends/kde/KDEPlatform.h \
 @COND_CORE_TRUE@       src/backends/kde/KDEPlatform.cpp \
-@COND_CORE_TRUE@       $(am__append_38)
+@COND_CORE_TRUE@       $(am__append_40)
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_kde_backenddir = $(BACKENDS_DIRECTORY)
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_kde_backend_LTLIBRARIES = $(src_backends_kde_lib)
 @COND_CORE_TRUE@src_backends_kde_platformkde_la_LIBADD = $(KDE_KWALLET_LIBS) $(SYNCEVOLUTION_LIBS) 
@@ -3174,6 +3225,19 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_CORE_TRUE@src_backends_maemo_syncmaemocal_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS)
 @COND_CORE_TRUE@src_backends_maemo_syncmaemocal_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
 @COND_CORE_TRUE@src_backends_maemo_syncmaemocal_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
+@COND_CORE_TRUE@src_backends_oauth2_libs = $(am__append_41)
+@COND_CORE_TRUE@src_backends_oauth2_sources =  \
+@COND_CORE_TRUE@       src/backends/oauth2/oauth2.h \
+@COND_CORE_TRUE@       src/backends/oauth2/oauth2.cpp $(NONE) \
+@COND_CORE_TRUE@       $(am__append_42)
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_oauth2_backenddir = $(BACKENDS_DIRECTORY)
+@COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_oauth2_backend_LTLIBRARIES = $(src_backends_oauth2_libs)
+@COND_CORE_TRUE@src_backends_oauth2_provideroauth2_la_SOURCES = $(src_backends_oauth2_sources)
+@COND_CORE_TRUE@src_backends_oauth2_provideroauth2_la_LIBADD = $(JSON_LIBS) $(GLIB_LIBS) $(SYNCEVOLUTION_LIBS)
+@COND_CORE_TRUE@src_backends_oauth2_provideroauth2_la_LDFLAGS = -module -avoid-version
+@COND_CORE_TRUE@src_backends_oauth2_provideroauth2_la_CXXFLAGS = $(JSON_CFLAGS)  $(GLIB_CFLAGS) $(SYNCEVO_WFLAGS) $(SYNCEVOLUTION_CFLAGS)
+@COND_CORE_TRUE@src_backends_oauth2_provideroauth2_la_CPPFLAGS = -DUSE_OAUTH2 -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
+@COND_CORE_TRUE@src_backends_oauth2_provideroauth2_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
 @COND_CORE_TRUE@src_backends_pbap_lib = src/backends/pbap/syncpbap.la
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_pbap_backenddir = $(BACKENDS_DIRECTORY)
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_pbap_backend_LTLIBRARIES = $(src_backends_pbap_lib)
@@ -3225,31 +3289,37 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_CORE_TRUE@  src/backends/signon/accounts/carddav.service-type \
 @COND_CORE_TRUE@  $(NONE)
 
-@COND_CORE_TRUE@src_backends_signon_libs = $(am__append_39) \
-@COND_CORE_TRUE@       $(am__append_40)
+@COND_CORE_TRUE@src_backends_signon_libs = $(am__append_43) \
+@COND_CORE_TRUE@       $(am__append_44) $(am__append_45)
 @COND_CORE_TRUE@src_backends_signon_common_sources =  \
 @COND_CORE_TRUE@       src/backends/signon/signon.h \
 @COND_CORE_TRUE@       src/backends/signon/signon.cpp $(NONE) \
-@COND_CORE_TRUE@       $(am__append_41)
+@COND_CORE_TRUE@       $(am__append_46)
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_signon_backenddir = $(BACKENDS_DIRECTORY)
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_signon_backend_LTLIBRARIES = $(src_backends_signon_libs)
 @COND_CORE_TRUE@src_backends_signon_common_libadd = $(SYNCEVOLUTION_LIBS) 
 @COND_CORE_TRUE@src_backends_signon_common_ldflags = -module -avoid-version
 @COND_CORE_TRUE@src_backends_signon_common_cxxflags = $(SYNCEVOLUTION_CFLAGS)
-@COND_CORE_TRUE@src_backends_signon_common_cppflags = -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
+@COND_CORE_TRUE@src_backends_signon_common_cppflags = -DUSE_SIGNON -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
 @COND_CORE_TRUE@src_backends_signon_common_dependencies = src/syncevo/libsyncevolution.la
 @COND_CORE_TRUE@@USE_GSSO_TRUE@src_backends_signon_providergsso_la_SOURCES = $(src_backends_signon_common_sources)
-@COND_CORE_TRUE@@USE_GSSO_TRUE@src_backends_signon_providergsso_la_LIBADD = $(GSSO_LIBS) $(src_backends_signon_common_libadd) 
+@COND_CORE_TRUE@@USE_GSSO_TRUE@src_backends_signon_providergsso_la_LIBADD = $(GSSO_LIBS) $(ACCOUNTS_LIBS) $(src_backends_signon_common_libadd) 
 @COND_CORE_TRUE@@USE_GSSO_TRUE@src_backends_signon_providergsso_la_LDFLAGS = $(src_backends_signon_common_ldflags)
-@COND_CORE_TRUE@@USE_GSSO_TRUE@src_backends_signon_providergsso_la_CXXFLAGS = $(GSSO_CFLAGS) $(src_backends_signon_common_cxxflags)
-@COND_CORE_TRUE@@USE_GSSO_TRUE@src_backends_signon_providergsso_la_CPPFLAGS = $(src_backends_signon_common_cppflags)
+@COND_CORE_TRUE@@USE_GSSO_TRUE@src_backends_signon_providergsso_la_CXXFLAGS = $(GSSO_CFLAGS) $(ACCOUNTS_CFLAGS) $(src_backends_signon_common_cxxflags)
+@COND_CORE_TRUE@@USE_GSSO_TRUE@src_backends_signon_providergsso_la_CPPFLAGS = -DUSE_GSSO -DUSE_ACCOUNTS $(src_backends_signon_common_cppflags)
 @COND_CORE_TRUE@@USE_GSSO_TRUE@src_backends_signon_providergsso_la_DEPENDENCIES = $(src_backends_signon_common_dependencies)
 @COND_CORE_TRUE@@USE_UOA_TRUE@src_backends_signon_provideruoa_la_SOURCES = $(src_backends_signon_common_sources)
-@COND_CORE_TRUE@@USE_UOA_TRUE@src_backends_signon_provideruoa_la_LIBADD = $(UOA_LIBS) $(src_backends_signon_common_libadd)
+@COND_CORE_TRUE@@USE_UOA_TRUE@src_backends_signon_provideruoa_la_LIBADD = $(UOA_LIBS) $(ACCOUNTS_LIBS) $(src_backends_signon_common_libadd)
 @COND_CORE_TRUE@@USE_UOA_TRUE@src_backends_signon_provideruoa_la_LDFLAGS = $(src_backends_signon_common_ldflags)
-@COND_CORE_TRUE@@USE_UOA_TRUE@src_backends_signon_provideruoa_la_CXXFLAGS = $(UOA_CFLAGS) $(src_backends_signon_common_cxxflags)
-@COND_CORE_TRUE@@USE_UOA_TRUE@src_backends_signon_provideruoa_la_CPPFLAGS = $(src_backends_signon_common_cppflags)
+@COND_CORE_TRUE@@USE_UOA_TRUE@src_backends_signon_provideruoa_la_CXXFLAGS = $(UOA_CFLAGS) $(ACCOUNTS_CFLAGS) $(src_backends_signon_common_cxxflags)
+@COND_CORE_TRUE@@USE_UOA_TRUE@src_backends_signon_provideruoa_la_CPPFLAGS = -DUSE_UOA -DUSE_ACCOUNTS $(src_backends_signon_common_cppflags)
 @COND_CORE_TRUE@@USE_UOA_TRUE@src_backends_signon_provideruoa_la_DEPENDENCIES = $(src_backends_signon_common_dependencies)
+@COND_CORE_TRUE@@USE_SIGNON_TRUE@src_backends_signon_providersignon_la_SOURCES = $(src_backends_signon_common_sources)
+@COND_CORE_TRUE@@USE_SIGNON_TRUE@src_backends_signon_providersignon_la_LIBADD = $($(DEFAULT_SIGNON)_LIBS) $(ACCOUNTS_LIBS) $(src_backends_signon_common_libadd)
+@COND_CORE_TRUE@@USE_SIGNON_TRUE@src_backends_signon_providersignon_la_LDFLAGS = $(src_backends_signon_common_ldflags)
+@COND_CORE_TRUE@@USE_SIGNON_TRUE@src_backends_signon_providersignon_la_CXXFLAGS = $($(DEFAULT_SIGNON)_CFLAGS) $(ACCOUNTS_CFLAGS) $(src_backends_signon_common_cxxflags)
+@COND_CORE_TRUE@@USE_SIGNON_TRUE@src_backends_signon_providersignon_la_CPPFLAGS = -DUSE_$(DEFAULT_SIGNON) $(src_backends_signon_common_cppflags)
+@COND_CORE_TRUE@@USE_SIGNON_TRUE@src_backends_signon_providersignon_la_DEPENDENCIES = $(src_backends_signon_common_dependencies)
 @COND_CORE_TRUE@src_backends_sqlite_lib = src/backends/sqlite/syncsqlite.la
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_sqlite_backenddir = $(BACKENDS_DIRECTORY)
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_sqlite_backend_LTLIBRARIES = $(src_backends_sqlite_lib)
@@ -3288,7 +3358,7 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_CORE_TRUE@src_backends_webdav_syncdav_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
 @COND_CORE_TRUE@WEBDAV_SO_CHECK_FILES =  \
 @COND_CORE_TRUE@       $(DESTDIR)/$(bindir)/syncevolution \
-@COND_CORE_TRUE@       $(am__append_44)
+@COND_CORE_TRUE@       $(am__append_49)
 @COND_CORE_TRUE@src_backends_xmlrpc_lib = src/backends/xmlrpc/syncxmlrpc.la
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_xmlrpc_backenddir = $(BACKENDS_DIRECTORY)
 @COND_CORE_TRUE@@ENABLE_MODULES_TRUE@src_backends_xmlrpc_backend_LTLIBRARIES = $(src_backends_xmlrpc_lib)
@@ -3442,7 +3512,7 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_DBUS_TRUE@       src/dbus/server/progress-data.cpp \
 @COND_DBUS_TRUE@       src/dbus/server/read-operations.cpp \
 @COND_DBUS_TRUE@       src/dbus/server/server.cpp \
-@COND_DBUS_TRUE@       src/dbus/server/session.cpp $(am__append_65)
+@COND_DBUS_TRUE@       src/dbus/server/session.cpp $(am__append_70)
 @COND_DBUS_TRUE@src_dbus_server_server_h_files =  \
 @COND_DBUS_TRUE@       $(src_dbus_server_server_cpp_files:.cpp=.h) \
 @COND_DBUS_TRUE@       src/dbus/server/notification-backend-base.h \
@@ -3456,26 +3526,26 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_DBUS_TRUE@       src/dbus/server/source-progress.h \
 @COND_DBUS_TRUE@       src/dbus/server/source-status.h \
 @COND_DBUS_TRUE@       src/dbus/server/timeout.h \
-@COND_DBUS_TRUE@       src/dbus/server/timer.h $(am__append_66)
+@COND_DBUS_TRUE@       src/dbus/server/timer.h $(am__append_71)
 @COND_DBUS_TRUE@src_dbus_server_libsyncevodbusserver_la_SOURCES = \
 @COND_DBUS_TRUE@  $(src_dbus_server_server_h_files) \
 @COND_DBUS_TRUE@  $(src_dbus_server_server_cpp_files) \
 @COND_DBUS_TRUE@  src/dbus/server/main.cpp
 
 @COND_DBUS_TRUE@nodist_src_dbus_server_libsyncevodbusserver_la_SOURCES =  \
-@COND_DBUS_TRUE@       $(am__append_67)
+@COND_DBUS_TRUE@       $(am__append_72)
 @COND_DBUS_TRUE@src_dbus_server_libsyncevodbusserver_la_LDFLAGS =  \
-@COND_DBUS_TRUE@       $(am__append_68)
+@COND_DBUS_TRUE@       $(am__append_73)
 @COND_DBUS_TRUE@src_dbus_server_libsyncevodbusserver_la_LIBADD =  \
 @COND_DBUS_TRUE@       $(LIBNOTIFY_LIBS) $(MLITE_LIBS) $(DBUS_LIBS) \
-@COND_DBUS_TRUE@       $(PCRECPP_LIBS) $(ICU_LIBS) $(am__append_69)
+@COND_DBUS_TRUE@       $(PCRECPP_LIBS) $(ICU_LIBS) $(am__append_74)
 @COND_DBUS_TRUE@src_dbus_server_libsyncevodbusserver_la_CPPFLAGS = -DHAVE_CONFIG_H -DSYNCEVOLUTION_LOCALEDIR=\"${SYNCEVOLUTION_LOCALEDIR}\" -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir) -I$(gdbus_dir) $(BACKEND_CPPFLAGS)
 @COND_DBUS_TRUE@src_dbus_server_libsyncevodbusserver_la_CXXFLAGS =  \
 @COND_DBUS_TRUE@       $(SYNCEVOLUTION_CXXFLAGS) $(CORE_CXXFLAGS) \
 @COND_DBUS_TRUE@       $(SYNTHESIS_CFLAGS) $(GLIB_CFLAGS) \
 @COND_DBUS_TRUE@       $(DBUS_CFLAGS) $(LIBNOTIFY_CFLAGS) \
 @COND_DBUS_TRUE@       $(MLITE_CFLAGS) $(SYNCEVO_WFLAGS) \
-@COND_DBUS_TRUE@       $(ICU_CFLAGS) $(am__append_70)
+@COND_DBUS_TRUE@       $(ICU_CFLAGS) $(am__append_75)
 @COND_DBUS_TRUE@src_dbus_server_dbus_helper_cpp_files = \
 @COND_DBUS_TRUE@  src/dbus/server/dbus-callbacks.cpp \
 @COND_DBUS_TRUE@  src/dbus/server/dbus-sync.cpp \
@@ -3503,7 +3573,7 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_DBUS_TRUE@src_dbus_server_autostart_DATA = $(src_dbus_server_desktop)
 @COND_DBUS_TRUE@src_dbus_server_service_files_in =  \
 @COND_DBUS_TRUE@       src/dbus/server/org.syncevolution.service.in \
-@COND_DBUS_TRUE@       $(am__append_74)
+@COND_DBUS_TRUE@       $(am__append_79)
 @COND_DBUS_TRUE@src_dbus_server_service_files = $(src_dbus_server_service_files_in:.service.in=.service)
 @COND_DBUS_TRUE@src_dbus_server_servicedir = $(DBUS_SERVICES_DIR)
 @COND_DBUS_TRUE@src_dbus_server_service_DATA = $(src_dbus_server_service_files)
@@ -3640,12 +3710,14 @@ src_cppflags = -I$(top_srcdir)/src $(am__append_3) $(am__append_8) \
 @COND_GTK2_FALSE@@COND_GUI_TRUE@src_gtk3_ui_sync_ui_moblin_LDADD = $(src_gtk3_ui_sync_ui_LDADD)
 @COND_GTK2_FALSE@@COND_GUI_TRUE@src_gtk3_ui_sync_ui_moblin_CFLAGS = $(src_gtk3_ui_sync_ui_CFLAGS)
 @COND_GTK2_FALSE@@COND_GUI_TRUE@src_gtk3_ui_sync_ui_moblin_CPPFLAGS = $(src_gtk3_ui_sync_ui_CPPFLAGS) -DUSE_MOBLIN_UX
-SYNCEVOLUTION_DEP = $(am__append_87)
-CORE_SOURCES = $(am__append_89)
+SYNCEVOLUTION_DEP = $(am__append_93)
+CORE_SOURCES = $(am__append_95)
 CORE_CXXFLAGS = $(SYNTHESIS_CFLAGS) $(CPPUNIT_CXXFLAGS)
 CORE_LDADD = $(SYNCEVOLUTION_LDADD) src/syncevo/libsyncevolution.la $(GLIB_LIBS) $(GTHREAD_LIBS) $(GOBJECT_LIBS) $(LIBS)
 CORE_DEP = $(SYNCEVOLUTION_DEP) src/syncevo/libsyncevolution.la $(SYNTHESIS_DEP)
-CORE_LD_FLAGS = -Wl,-uSyncEvolution_Module_Version -Wl,--export-dynamic $(CPPUNIT_LDFLAGS)
+CORE_LD_FLAGS = -Wl,-uSyncEvolution_Module_Version \
+       -Wl,--export-dynamic $(CPPUNIT_LDFLAGS) $(ADDITIONAL_LDFLAGS) \
+       $(am__append_96)
 src_syncevolution_SOURCES = \
   src/syncevolution.cpp \
   $(CORE_SOURCES)
@@ -3655,9 +3727,9 @@ src_syncevolution_SOURCES = \
 # SYNCEVOLUTION_LDADD will be replaced with libsyncebook.la/libsyncecal.la/libsyncsqlite.la
 # if linking statically against them, empty otherwise;
 # either way this does not lead to a dependency on those libs - done explicitly
-src_syncevolution_LDADD = $(CORE_LDADD) $(am__append_90)
+src_syncevolution_LDADD = $(CORE_LDADD) $(am__append_97)
 src_syncevolution_DEPENDENCIES = $(EXTRA_LTLIBRARIES) $(CORE_DEP) \
-       $(am__append_91)
+       $(am__append_98)
 src_syncevolution_LDFLAGS = $(PCRECPP_LIBS) $(CORE_LD_FLAGS) $(DBUS_LIBS)
 src_syncevolution_CXXFLAGS = $(PCRECPP_CFLAGS) $(SYNCEVOLUTION_CXXFLAGS) $(CORE_CXXFLAGS) $(DBUS_CFLAGS) $(SYNCEVO_WFLAGS)
 src_syncevolution_CPPFLAGS = $(src_cppflags) -I$(gdbus_dir)
@@ -3697,27 +3769,25 @@ src_syncevo_local_sync_DEPENDENCIES = $(top_builddir)/$(gdbus_build_dir)/libgdbu
 src_client_test_SOURCES = \
   src/client-test-app.cpp \
   test/ClientTest.cpp \
+  test/IcalTest.cpp \
   test/ClientTest.h \
   test/ClientTestAssert.h \
   test/client-test-main.cpp \
   $(CORE_SOURCES)
 
-nodist_src_client_test_SOURCES = test/test.cpp $(am__append_96)
+nodist_src_client_test_SOURCES = test/test.cpp $(am__append_104)
 
-# list of test file base files
+# List of test files which get copied verbatim from
+# $(top_srcdir)/test/testcases/ to src/testcases below. test/test.am
+# has the list for inclusion in "make dist" with the original
+# "test/" directory. We need to replace that here.
 #
 # Generated files (testcases/eds_event.ics.funambol.tem) are derived from
 # the original base file ($(srcdir)/test/testcases/eds_event.ics) by
 # applying a patch ($(srcdir)/test/testcases/eds_event.ics.funambol.tem.patch).
 # add files created via patches
-CLIENT_LIB_TEST_FILES = src/testcases/lcs/file1.txt \
-       src/testcases/lcs/file2.txt src/testcases/local.png \
-       src/testcases/templates/clients/SyncEvolution.ini \
-       src/testcases/templates/clients/phone/nokia/S40/7210c.ini \
-       src/testcases/google_event.ics src/testcases/yahoo_contact.vcf \
-       src/testcases/eds_contact.vcf src/testcases/eds_event.ics \
-       src/testcases/eds_event.ics.local src/testcases/eds_memo.ics \
-       src/testcases/eds_task.ics $(TEST_FILES_GENERATED)
+CLIENT_LIB_TEST_FILES = $(subst test/,src/,$(test_testcases)) \
+       $(TEST_FILES_GENERATED)
 
 # all patch files
 TEST_FILES_PATCHES = $(wildcard $(top_srcdir)/test/testcases/*.patch)
@@ -3735,14 +3805,16 @@ TEST_FILES_PATCHED = $(wildcard src/testcases/*.tem)
 # To pull in those object files, LDFLAGS must contain undef statements
 # for the C symbols exported by the macro.
 src_client_test_libs = src/syncevo/libsyncevolution.la \
-       $(am__append_93)
+       $(am__append_100)
 
 # src/syncevo/libsyncevolution.la -> src/syncevo/.libs/libsyncevolution.a -> -Wl,-u...
 src_client_test_undef = $(shell nm $(patsubst %.la,%.a,$(subst /lib,/.libs/lib,$(src_client_test_libs))) | grep funambolAutoRegisterRegistry | sed -e 's/.* /-Wl,-u/' )
 src_client_test_CPPFLAGS = -DHAVE_CONFIG_H -DENABLE_INTEGRATION_TESTS -DENABLE_UNIT_TESTS $(src_cppflags) $(QT_CPPFLAGS)
 src_client_test_CXXFLAGS = $(filter-out -O2, @CPPUNIT_CXXFLAGS@ $(PCRECPP_CFLAGS) $(SYNCEVOLUTION_CXXFLAGS) $(CORE_CXXFLAGS) $(filter-out -O2 -g -W -Wall, $(QT_CXXFLAGS)) $(SYNCEVO_WFLAGS))
 src_client_test_LDFLAGS = @CPPUNIT_LDFLAGS@  $(src_client_test_undef) $(CORE_LD_FLAGS) $(QT_LDFLAGS)
-src_client_test_LDADD = $(src_client_test_libs) $(CORE_LDADD) $(PCRECPP_LIBS) $(SYNTHESIS_ENGINE) $(QT_LIBS)
+src_client_test_LDADD = $(src_client_test_libs) $(CORE_LDADD) \
+       $(PCRECPP_LIBS) $(SYNTHESIS_ENGINE) $(QT_LIBS) \
+       $(am__append_101)
 
 # The binary does not really depend on the test cases, only running it does.
 # Listing the dependencies here is done to ensure that one doesn't accidentally
@@ -3750,19 +3822,9 @@ src_client_test_LDADD = $(src_client_test_libs) $(CORE_LDADD) $(PCRECPP_LIBS) $(
 src_client_test_DEPENDENCIES = $(EXTRA_LTLIBRARIES) \
        $(src_client_test_libs) $(CORE_DEP) $(CLIENT_LIB_TEST_FILES) \
        testcase2patch src/synccompare src/synclog2html src/templates \
-       $(am__append_97)
+       $(am__append_105)
 @ENABLE_TESTING_TRUE@src_testcasesdir = $(testdir)/testcases
-@ENABLE_TESTING_TRUE@dist_src_testcases_DATA = \
-@ENABLE_TESTING_TRUE@  src/testcases/local.png \
-@ENABLE_TESTING_TRUE@  src/testcases/google_event.ics \
-@ENABLE_TESTING_TRUE@  src/testcases/yahoo_contact.vcf \
-@ENABLE_TESTING_TRUE@  src/testcases/eds_contact.vcf \
-@ENABLE_TESTING_TRUE@  src/testcases/eds_event.ics \
-@ENABLE_TESTING_TRUE@  src/testcases/eds_event.ics.local \
-@ENABLE_TESTING_TRUE@  src/testcases/eds_memo.ics \
-@ENABLE_TESTING_TRUE@  src/testcases/eds_task.ics \
-@ENABLE_TESTING_TRUE@  $(TEST_FILES_GENERATED)
-
+@ENABLE_TESTING_TRUE@dist_src_testcases_DATA = $(TEST_FILES_GENERATED)
 @ENABLE_TESTING_TRUE@src_testcases_lcsdir = $(testdir)/testcases/lcs
 @ENABLE_TESTING_TRUE@dist_src_testcases_lcs_DATA = \
 @ENABLE_TESTING_TRUE@  src/testcases/lcs/file1.txt \
@@ -3782,13 +3844,56 @@ src_abort_redirect_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(CORE_CXXFLAGS) $(SYNCE
 src_abort_redirect_LDFLAGS = $(CORE_LD_FLAGS)
 src_abort_redirect_LDADD = $(CORE_LDADD)
 src_abort_redirect_DEPENDENCIES = all
+@COND_CORE_TRUE@test_testcases = \
+@COND_CORE_TRUE@  test/testcases/eds_event.ics \
+@COND_CORE_TRUE@  test/testcases/eds_event.ics.local \
+@COND_CORE_TRUE@  test/testcases/eds_task.ics \
+@COND_CORE_TRUE@  test/testcases/vcal10.ics \
+@COND_CORE_TRUE@  test/testcases/carddav.vcf \
+@COND_CORE_TRUE@  test/testcases/eds_contact.vcf \
+@COND_CORE_TRUE@  test/testcases/eds_memo.ics \
+@COND_CORE_TRUE@  test/testcases/google_event.ics \
+@COND_CORE_TRUE@  test/testcases/yahoo_contact.vcf \
+@COND_CORE_TRUE@  test/testcases/lcs/file1.txt \
+@COND_CORE_TRUE@  test/testcases/lcs/file2.txt \
+@COND_CORE_TRUE@  test/testcases/local.png \
+@COND_CORE_TRUE@  test/testcases/templates/clients/phone/nokia/S40/7210c.ini \
+@COND_CORE_TRUE@  test/testcases/templates/clients/SyncEvolution.ini \
+@COND_CORE_TRUE@  test/testcases/synctests/apple/eds_contact/testUpload/local-synced \
+@COND_CORE_TRUE@  test/testcases/synctests/apple/eds_contact/testUpload/local \
+@COND_CORE_TRUE@  test/testcases/synctests/apple/eds_contact/testUpload/modify-remote \
+@COND_CORE_TRUE@  test/testcases/synctests/apple/eds_contact/testUpload/remote \
+@COND_CORE_TRUE@  test/testcases/synctests/apple/eds_contact/testDownload/modify-local \
+@COND_CORE_TRUE@  test/testcases/synctests/apple/eds_contact/testDownload/local \
+@COND_CORE_TRUE@  test/testcases/synctests/apple/eds_contact/testDownload/remote \
+@COND_CORE_TRUE@  test/testcases/synctests/apple/eds_contact/testDownload/remote-synced \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testUpload/local-synced \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testUpload/local \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testUpload/modify-remote \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testUpload/remote \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testDownload/modify-local \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testDownload/local \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testDownload/remote \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testDownload/remote-synced \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testUpdateRemoteWins/modify-local \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testUpdateRemoteWins/local-synced \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testUpdateRemoteWins/local \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testUpdateRemoteWins/modify-remote \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testUpdateRemoteWins/remote-synced \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testUpdateLocalWins/modify-local \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testUpdateLocalWins/local-synced \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testUpdateLocalWins/local \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testUpdateLocalWins/modify-remote \
+@COND_CORE_TRUE@  test/testcases/synctests/googlecontacts/eds_contact/testUpdateLocalWins/remote-synced \
+@COND_CORE_TRUE@  $(NOP)
+
 @COND_CORE_TRUE@@COND_DBUS_TRUE@test_dbus_client_server_SOURCES =  \
 @COND_CORE_TRUE@@COND_DBUS_TRUE@       test/dbus-client-server.cpp \
-@COND_CORE_TRUE@@COND_DBUS_TRUE@       $(am__append_100)
+@COND_CORE_TRUE@@COND_DBUS_TRUE@       $(am__append_108)
 @COND_CORE_TRUE@@COND_DBUS_TRUE@test_dbus_client_server_CPPFLAGS = -I$(gdbus_dir) -I$(top_srcdir)/src
-@COND_CORE_TRUE@@COND_DBUS_TRUE@test_dbus_client_server_CXXFLAGS = $(CPPUNIT_CXXFLAGS) $(SYNCEVOLUTION_CXXFLAGS) $(BACKEND_CPPFLAGS) $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(GOBJECT_CFLAGS)
+@COND_CORE_TRUE@@COND_DBUS_TRUE@test_dbus_client_server_CXXFLAGS = $(CPPUNIT_CXXFLAGS) $(SYNCEVOLUTION_CXXFLAGS) $(BACKEND_CPPFLAGS) $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(GOBJECT_CFLAGS) $(PCRECPP_CFLAGS)
 @COND_CORE_TRUE@@COND_DBUS_TRUE@test_dbus_client_server_LDFLAGS = $(CPPUNIT_LDFLAGS)
-@COND_CORE_TRUE@@COND_DBUS_TRUE@test_dbus_client_server_LDADD = $(gdbus_build_dir)/libgdbussyncevo.la src/syncevo/libsyncevolution.la $(DBUS_LIBS) $(GLIB_LIBS) $(GOBJECT_LIBS)
+@COND_CORE_TRUE@@COND_DBUS_TRUE@test_dbus_client_server_LDADD = $(gdbus_build_dir)/libgdbussyncevo.la src/syncevo/libsyncevolution.la $(DBUS_LIBS) $(GLIB_LIBS) $(GOBJECT_LIBS) $(PCRECPP_LIBS)
 @COND_CORE_TRUE@@COND_DBUS_TRUE@test_dbus_client_server_DEPENDENCIES = $(gdbus_build_dir)/libgdbussyncevo.la src/syncevo/libsyncevolution.la
 TEST_README_FILES = $(wildcard $(top_srcdir)/test/README.*)
 
@@ -3865,7 +3970,7 @@ SYNCEVOLUTION_evolution_DEB_REQUIRES = \
 # Some exceptions for the link check above (= symbol may be used without linking).
 # SySync_ConsolePrintf is expected by libsmltk and has to be provided by caller.
 LINK_CHECK_ALLOWED = -e xxxxxxxx -e \
-       'SySync_ConsolePrintf.*libsmltk.so' $(am__append_114)
+       'SySync_ConsolePrintf.*libsmltk.so' $(am__append_122)
 @COND_CROSS_COMPILING_FALSE@RUN_SYNCEVOLUTION_CHECK = die if $$?; return $$buffer;
 
 # Be strict about running 'syncevolution' only when not doing
@@ -3881,7 +3986,7 @@ all: $(BUILT_SOURCES) config.h
 .SUFFIXES: .c .cpp .lo .o .obj
 am--refresh: Makefile
        @:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/setup-variables.am $(top_srcdir)/autotroll.am $(top_srcdir)/build/build.am $(srcdir)/src/src.am $(top_srcdir)/src/gnome-bluetooth/gnome-bluetooth.am $(top_srcdir)/src/gdbusxx/gdbusxx.am $(top_srcdir)/src/gdbus/gdbus.am $(top_srcdir)/src/syncevo/syncevo.am $(top_srcdir)/src/syncevo/configs/configs.am $(top_srcdir)/src/syncevo/configs/configs_xml.am $(top_srcdir)/src/backends/backends.am $(top_srcdir)/src/backends/activesync/activesync.am $(top_srcdir)/src/backends/addressbook/addressbook.am $(top_srcdir)/src/backends/akonadi/akonadi.am $(top_srcdir)/src/backends/evolution/evolution.am $(top_srcdir)/src/backends/file/file.am $(top_srcdir)/src/backends/gnome/gnome.am $(top_srcdir)/src/backends/goa/goa.am $(top_srcdir)/src/backends/kcalextended/kcalextended.am $(top_srcdir)/src/backends/kde/kde.am $(top_srcdir)/src/backends/maemo/maemo.am $(top_srcdir)/src/backends/pbap/pbap.am $(top_srcdir)/src/backends/qtcontacts/qtcontacts.am $(top_srcdir)/src/backends/signon/signon.am $(top_srcdir)/src/backends/sqlite/sqlite.am $(top_srcdir)/src/backends/webdav/webdav.am $(top_srcdir)/src/backends/xmlrpc/xmlrpc.am $(top_srcdir)/src/templates/templates.am $(top_srcdir)/src/dbus/dbus.am $(top_srcdir)/src/dbus/interfaces/interfaces.am $(top_srcdir)/src/dbus/glib/glib.am $(top_srcdir)/src/dbus/qt/qt.am $(top_srcdir)/src/dbus/server/server.am $(top_srcdir)/src/gtk-ui/gtk-ui.am $(top_srcdir)/src/gtk3-ui/gtk-ui.am $(top_srcdir)/src/testcases.am $(srcdir)/test/test.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/setup-variables.am $(top_srcdir)/autotroll.am $(top_srcdir)/build/build.am $(srcdir)/src/src.am $(top_srcdir)/src/gnome-bluetooth/gnome-bluetooth.am $(top_srcdir)/src/gdbusxx/gdbusxx.am $(top_srcdir)/src/gdbus/gdbus.am $(top_srcdir)/src/syncevo/syncevo.am $(top_srcdir)/src/syncevo/configs/configs.am $(top_srcdir)/src/syncevo/configs/configs_xml.am $(top_srcdir)/src/backends/backends.am $(top_srcdir)/src/backends/activesync/activesync.am $(top_srcdir)/src/backends/akonadi/akonadi.am $(top_srcdir)/src/backends/evolution/evolution.am $(top_srcdir)/src/backends/file/file.am $(top_srcdir)/src/backends/gnome/gnome.am $(top_srcdir)/src/backends/goa/goa.am $(top_srcdir)/src/backends/kcalextended/kcalextended.am $(top_srcdir)/src/backends/kde/kde.am $(top_srcdir)/src/backends/maemo/maemo.am $(top_srcdir)/src/backends/oauth2/oauth2.am $(top_srcdir)/src/backends/pbap/pbap.am $(top_srcdir)/src/backends/qtcontacts/qtcontacts.am $(top_srcdir)/src/backends/signon/signon.am $(top_srcdir)/src/backends/sqlite/sqlite.am $(top_srcdir)/src/backends/webdav/webdav.am $(top_srcdir)/src/backends/xmlrpc/xmlrpc.am $(top_srcdir)/src/templates/templates.am $(top_srcdir)/src/dbus/dbus.am $(top_srcdir)/src/dbus/interfaces/interfaces.am $(top_srcdir)/src/dbus/glib/glib.am $(top_srcdir)/src/dbus/qt/qt.am $(top_srcdir)/src/dbus/server/server.am $(top_srcdir)/src/gtk-ui/gtk-ui.am $(top_srcdir)/src/gtk3-ui/gtk-ui.am $(top_srcdir)/src/testcases.am $(srcdir)/test/test.am $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
@@ -3904,7 +4009,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
            echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
            cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
        esac;
-$(top_srcdir)/setup-variables.am $(top_srcdir)/autotroll.am $(top_srcdir)/build/build.am $(srcdir)/src/src.am $(top_srcdir)/src/gnome-bluetooth/gnome-bluetooth.am $(top_srcdir)/src/gdbusxx/gdbusxx.am $(top_srcdir)/src/gdbus/gdbus.am $(top_srcdir)/src/syncevo/syncevo.am $(top_srcdir)/src/syncevo/configs/configs.am $(top_srcdir)/src/syncevo/configs/configs_xml.am $(top_srcdir)/src/backends/backends.am $(top_srcdir)/src/backends/activesync/activesync.am $(top_srcdir)/src/backends/addressbook/addressbook.am $(top_srcdir)/src/backends/akonadi/akonadi.am $(top_srcdir)/src/backends/evolution/evolution.am $(top_srcdir)/src/backends/file/file.am $(top_srcdir)/src/backends/gnome/gnome.am $(top_srcdir)/src/backends/goa/goa.am $(top_srcdir)/src/backends/kcalextended/kcalextended.am $(top_srcdir)/src/backends/kde/kde.am $(top_srcdir)/src/backends/maemo/maemo.am $(top_srcdir)/src/backends/pbap/pbap.am $(top_srcdir)/src/backends/qtcontacts/qtcontacts.am $(top_srcdir)/src/backends/signon/signon.am $(top_srcdir)/src/backends/sqlite/sqlite.am $(top_srcdir)/src/backends/webdav/webdav.am $(top_srcdir)/src/backends/xmlrpc/xmlrpc.am $(top_srcdir)/src/templates/templates.am $(top_srcdir)/src/dbus/dbus.am $(top_srcdir)/src/dbus/interfaces/interfaces.am $(top_srcdir)/src/dbus/glib/glib.am $(top_srcdir)/src/dbus/qt/qt.am $(top_srcdir)/src/dbus/server/server.am $(top_srcdir)/src/gtk-ui/gtk-ui.am $(top_srcdir)/src/gtk3-ui/gtk-ui.am $(top_srcdir)/src/testcases.am $(srcdir)/test/test.am:
+$(top_srcdir)/setup-variables.am $(top_srcdir)/autotroll.am $(top_srcdir)/build/build.am $(srcdir)/src/src.am $(top_srcdir)/src/gnome-bluetooth/gnome-bluetooth.am $(top_srcdir)/src/gdbusxx/gdbusxx.am $(top_srcdir)/src/gdbus/gdbus.am $(top_srcdir)/src/syncevo/syncevo.am $(top_srcdir)/src/syncevo/configs/configs.am $(top_srcdir)/src/syncevo/configs/configs_xml.am $(top_srcdir)/src/backends/backends.am $(top_srcdir)/src/backends/activesync/activesync.am $(top_srcdir)/src/backends/akonadi/akonadi.am $(top_srcdir)/src/backends/evolution/evolution.am $(top_srcdir)/src/backends/file/file.am $(top_srcdir)/src/backends/gnome/gnome.am $(top_srcdir)/src/backends/goa/goa.am $(top_srcdir)/src/backends/kcalextended/kcalextended.am $(top_srcdir)/src/backends/kde/kde.am $(top_srcdir)/src/backends/maemo/maemo.am $(top_srcdir)/src/backends/oauth2/oauth2.am $(top_srcdir)/src/backends/pbap/pbap.am $(top_srcdir)/src/backends/qtcontacts/qtcontacts.am $(top_srcdir)/src/backends/signon/signon.am $(top_srcdir)/src/backends/sqlite/sqlite.am $(top_srcdir)/src/backends/webdav/webdav.am $(top_srcdir)/src/backends/xmlrpc/xmlrpc.am $(top_srcdir)/src/templates/templates.am $(top_srcdir)/src/dbus/dbus.am $(top_srcdir)/src/dbus/interfaces/interfaces.am $(top_srcdir)/src/dbus/glib/glib.am $(top_srcdir)/src/dbus/qt/qt.am $(top_srcdir)/src/dbus/server/server.am $(top_srcdir)/src/gtk-ui/gtk-ui.am $(top_srcdir)/src/gtk3-ui/gtk-ui.am $(top_srcdir)/src/testcases.am $(srcdir)/test/test.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck
@@ -4014,38 +4119,6 @@ clean-src_backends_activesync_backendLTLIBRARIES:
          echo "rm -f \"$${dir}/so_locations\""; \
          rm -f "$${dir}/so_locations"; \
        done
-install-src_backends_addressbook_backendLTLIBRARIES: $(src_backends_addressbook_backend_LTLIBRARIES)
-       @$(NORMAL_INSTALL)
-       @list='$(src_backends_addressbook_backend_LTLIBRARIES)'; test -n "$(src_backends_addressbook_backenddir)" || list=; \
-       list2=; for p in $$list; do \
-         if test -f $$p; then \
-           list2="$$list2 $$p"; \
-         else :; fi; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(MKDIR_P) '$(DESTDIR)$(src_backends_addressbook_backenddir)'"; \
-         $(MKDIR_P) "$(DESTDIR)$(src_backends_addressbook_backenddir)" || exit 1; \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(src_backends_addressbook_backenddir)'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(src_backends_addressbook_backenddir)"; \
-       }
-
-uninstall-src_backends_addressbook_backendLTLIBRARIES:
-       @$(NORMAL_UNINSTALL)
-       @list='$(src_backends_addressbook_backend_LTLIBRARIES)'; test -n "$(src_backends_addressbook_backenddir)" || list=; \
-       for p in $$list; do \
-         $(am__strip_dir) \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(src_backends_addressbook_backenddir)/$$f'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(src_backends_addressbook_backenddir)/$$f"; \
-       done
-
-clean-src_backends_addressbook_backendLTLIBRARIES:
-       -test -z "$(src_backends_addressbook_backend_LTLIBRARIES)" || rm -f $(src_backends_addressbook_backend_LTLIBRARIES)
-       @list='$(src_backends_addressbook_backend_LTLIBRARIES)'; for p in $$list; do \
-         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-         test "$$dir" != "$$p" || dir=.; \
-         echo "rm -f \"$${dir}/so_locations\""; \
-         rm -f "$${dir}/so_locations"; \
-       done
 install-src_backends_akonadi_backendLTLIBRARIES: $(src_backends_akonadi_backend_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        @list='$(src_backends_akonadi_backend_LTLIBRARIES)'; test -n "$(src_backends_akonadi_backenddir)" || list=; \
@@ -4302,6 +4375,38 @@ clean-src_backends_maemo_backendLTLIBRARIES:
          echo "rm -f \"$${dir}/so_locations\""; \
          rm -f "$${dir}/so_locations"; \
        done
+install-src_backends_oauth2_backendLTLIBRARIES: $(src_backends_oauth2_backend_LTLIBRARIES)
+       @$(NORMAL_INSTALL)
+       @list='$(src_backends_oauth2_backend_LTLIBRARIES)'; test -n "$(src_backends_oauth2_backenddir)" || list=; \
+       list2=; for p in $$list; do \
+         if test -f $$p; then \
+           list2="$$list2 $$p"; \
+         else :; fi; \
+       done; \
+       test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(src_backends_oauth2_backenddir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(src_backends_oauth2_backenddir)" || exit 1; \
+         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(src_backends_oauth2_backenddir)'"; \
+         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(src_backends_oauth2_backenddir)"; \
+       }
+
+uninstall-src_backends_oauth2_backendLTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       @list='$(src_backends_oauth2_backend_LTLIBRARIES)'; test -n "$(src_backends_oauth2_backenddir)" || list=; \
+       for p in $$list; do \
+         $(am__strip_dir) \
+         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(src_backends_oauth2_backenddir)/$$f'"; \
+         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(src_backends_oauth2_backenddir)/$$f"; \
+       done
+
+clean-src_backends_oauth2_backendLTLIBRARIES:
+       -test -z "$(src_backends_oauth2_backend_LTLIBRARIES)" || rm -f $(src_backends_oauth2_backend_LTLIBRARIES)
+       @list='$(src_backends_oauth2_backend_LTLIBRARIES)'; for p in $$list; do \
+         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+         test "$$dir" != "$$p" || dir=.; \
+         echo "rm -f \"$${dir}/so_locations\""; \
+         rm -f "$${dir}/so_locations"; \
+       done
 install-src_backends_pbap_backendLTLIBRARIES: $(src_backends_pbap_backend_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        @list='$(src_backends_pbap_backend_LTLIBRARIES)'; test -n "$(src_backends_pbap_backenddir)" || list=; \
@@ -4540,20 +4645,6 @@ src/backends/activesync/src_backends_activesync_syncactivesync_la-ActiveSyncCale
        src/backends/activesync/$(DEPDIR)/$(am__dirstamp)
 src/backends/activesync/syncactivesync.la: $(src_backends_activesync_syncactivesync_la_OBJECTS) $(src_backends_activesync_syncactivesync_la_DEPENDENCIES) $(EXTRA_src_backends_activesync_syncactivesync_la_DEPENDENCIES) src/backends/activesync/$(am__dirstamp)
        $(AM_V_CXXLD)$(src_backends_activesync_syncactivesync_la_LINK) $(am_src_backends_activesync_syncactivesync_la_rpath) $(src_backends_activesync_syncactivesync_la_OBJECTS) $(src_backends_activesync_syncactivesync_la_LIBADD) $(LIBS)
-src/backends/addressbook/$(am__dirstamp):
-       @$(MKDIR_P) src/backends/addressbook
-       @: > src/backends/addressbook/$(am__dirstamp)
-src/backends/addressbook/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) src/backends/addressbook/$(DEPDIR)
-       @: > src/backends/addressbook/$(DEPDIR)/$(am__dirstamp)
-src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookConstants.lo:  \
-       src/backends/addressbook/$(am__dirstamp) \
-       src/backends/addressbook/$(DEPDIR)/$(am__dirstamp)
-src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookSource.lo:  \
-       src/backends/addressbook/$(am__dirstamp) \
-       src/backends/addressbook/$(DEPDIR)/$(am__dirstamp)
-src/backends/addressbook/syncaddressbook.la: $(src_backends_addressbook_syncaddressbook_la_OBJECTS) $(src_backends_addressbook_syncaddressbook_la_DEPENDENCIES) $(EXTRA_src_backends_addressbook_syncaddressbook_la_DEPENDENCIES) src/backends/addressbook/$(am__dirstamp)
-       $(AM_V_CXXLD)$(src_backends_addressbook_syncaddressbook_la_LINK) $(am_src_backends_addressbook_syncaddressbook_la_rpath) $(src_backends_addressbook_syncaddressbook_la_OBJECTS) $(src_backends_addressbook_syncaddressbook_la_LIBADD) $(LIBS)
 src/backends/akonadi/$(am__dirstamp):
        @$(MKDIR_P) src/backends/akonadi
        @: > src/backends/akonadi/$(am__dirstamp)
@@ -4585,9 +4676,6 @@ src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionSyncSource.lo
 src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionCalendarSource.lo:  \
        src/backends/evolution/$(am__dirstamp) \
        src/backends/evolution/$(DEPDIR)/$(am__dirstamp)
-src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionMemoSource.lo:  \
-       src/backends/evolution/$(am__dirstamp) \
-       src/backends/evolution/$(DEPDIR)/$(am__dirstamp)
 src/backends/evolution/src_backends_evolution_syncecal_la-e-cal-check-timezones.lo:  \
        src/backends/evolution/$(am__dirstamp) \
        src/backends/evolution/$(DEPDIR)/$(am__dirstamp)
@@ -4668,6 +4756,20 @@ src/backends/maemo/src_backends_maemo_syncmaemocal_la-MaemoCalendarSource.lo:  \
        src/backends/maemo/$(DEPDIR)/$(am__dirstamp)
 src/backends/maemo/syncmaemocal.la: $(src_backends_maemo_syncmaemocal_la_OBJECTS) $(src_backends_maemo_syncmaemocal_la_DEPENDENCIES) $(EXTRA_src_backends_maemo_syncmaemocal_la_DEPENDENCIES) src/backends/maemo/$(am__dirstamp)
        $(AM_V_CXXLD)$(src_backends_maemo_syncmaemocal_la_LINK) $(am_src_backends_maemo_syncmaemocal_la_rpath) $(src_backends_maemo_syncmaemocal_la_OBJECTS) $(src_backends_maemo_syncmaemocal_la_LIBADD) $(LIBS)
+src/backends/oauth2/$(am__dirstamp):
+       @$(MKDIR_P) src/backends/oauth2
+       @: > src/backends/oauth2/$(am__dirstamp)
+src/backends/oauth2/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) src/backends/oauth2/$(DEPDIR)
+       @: > src/backends/oauth2/$(DEPDIR)/$(am__dirstamp)
+src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2.lo:  \
+       src/backends/oauth2/$(am__dirstamp) \
+       src/backends/oauth2/$(DEPDIR)/$(am__dirstamp)
+src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2Register.lo:  \
+       src/backends/oauth2/$(am__dirstamp) \
+       src/backends/oauth2/$(DEPDIR)/$(am__dirstamp)
+src/backends/oauth2/provideroauth2.la: $(src_backends_oauth2_provideroauth2_la_OBJECTS) $(src_backends_oauth2_provideroauth2_la_DEPENDENCIES) $(EXTRA_src_backends_oauth2_provideroauth2_la_DEPENDENCIES) src/backends/oauth2/$(am__dirstamp)
+       $(AM_V_CXXLD)$(src_backends_oauth2_provideroauth2_la_LINK) $(am_src_backends_oauth2_provideroauth2_la_rpath) $(src_backends_oauth2_provideroauth2_la_OBJECTS) $(src_backends_oauth2_provideroauth2_la_LIBADD) $(LIBS)
 src/backends/pbap/$(am__dirstamp):
        @$(MKDIR_P) src/backends/pbap
        @: > src/backends/pbap/$(am__dirstamp)
@@ -4704,6 +4806,14 @@ src/backends/signon/src_backends_signon_providergsso_la-signonRegister.lo:  \
        src/backends/signon/$(DEPDIR)/$(am__dirstamp)
 src/backends/signon/providergsso.la: $(src_backends_signon_providergsso_la_OBJECTS) $(src_backends_signon_providergsso_la_DEPENDENCIES) $(EXTRA_src_backends_signon_providergsso_la_DEPENDENCIES) src/backends/signon/$(am__dirstamp)
        $(AM_V_CXXLD)$(src_backends_signon_providergsso_la_LINK) $(am_src_backends_signon_providergsso_la_rpath) $(src_backends_signon_providergsso_la_OBJECTS) $(src_backends_signon_providergsso_la_LIBADD) $(LIBS)
+src/backends/signon/src_backends_signon_providersignon_la-signon.lo:  \
+       src/backends/signon/$(am__dirstamp) \
+       src/backends/signon/$(DEPDIR)/$(am__dirstamp)
+src/backends/signon/src_backends_signon_providersignon_la-signonRegister.lo:  \
+       src/backends/signon/$(am__dirstamp) \
+       src/backends/signon/$(DEPDIR)/$(am__dirstamp)
+src/backends/signon/providersignon.la: $(src_backends_signon_providersignon_la_OBJECTS) $(src_backends_signon_providersignon_la_DEPENDENCIES) $(EXTRA_src_backends_signon_providersignon_la_DEPENDENCIES) src/backends/signon/$(am__dirstamp)
+       $(AM_V_CXXLD)$(src_backends_signon_providersignon_la_LINK) $(am_src_backends_signon_providersignon_la_rpath) $(src_backends_signon_providersignon_la_OBJECTS) $(src_backends_signon_providersignon_la_LIBADD) $(LIBS)
 src/backends/signon/src_backends_signon_provideruoa_la-signon.lo:  \
        src/backends/signon/$(am__dirstamp) \
        src/backends/signon/$(DEPDIR)/$(am__dirstamp)
@@ -4997,6 +5107,9 @@ src/syncevo/src_syncevo_libsyncevolution_la-eds_abi_wrapper.lo:  \
 src/syncevo/src_syncevo_libsyncevolution_la-GLibSupport.lo:  \
        src/syncevo/$(am__dirstamp) \
        src/syncevo/$(DEPDIR)/$(am__dirstamp)
+src/syncevo/src_syncevo_libsyncevolution_la-GVariantSupport.lo:  \
+       src/syncevo/$(am__dirstamp) \
+       src/syncevo/$(DEPDIR)/$(am__dirstamp)
 src/syncevo/src_syncevo_libsyncevolution_la-SyncML.lo:  \
        src/syncevo/$(am__dirstamp) \
        src/syncevo/$(DEPDIR)/$(am__dirstamp)
@@ -5030,6 +5143,9 @@ src/syncevo/src_syncevo_libsyncevolution_la-SoupTransportAgent.lo:  \
 src/syncevo/src_syncevo_libsyncevolution_la-LocalTransportAgent.lo:  \
        src/syncevo/$(am__dirstamp) \
        src/syncevo/$(DEPDIR)/$(am__dirstamp)
+src/syncevo/src_syncevo_libsyncevolution_la-Exception.lo:  \
+       src/syncevo/$(am__dirstamp) \
+       src/syncevo/$(DEPDIR)/$(am__dirstamp)
 src/syncevo/src_syncevo_libsyncevolution_la-util.lo:  \
        src/syncevo/$(am__dirstamp) \
        src/syncevo/$(DEPDIR)/$(am__dirstamp)
@@ -5102,9 +5218,15 @@ src/syncevo/src_syncevo_libsyncevolution_la-MapSyncSource.lo:  \
 src/syncevo/src_syncevo_libsyncevolution_la-TrackingSyncSource.lo:  \
        src/syncevo/$(am__dirstamp) \
        src/syncevo/$(DEPDIR)/$(am__dirstamp)
+src/syncevo/src_syncevo_libsyncevolution_la-gsignond-pipe-stream.lo:  \
+       src/syncevo/$(am__dirstamp) \
+       src/syncevo/$(DEPDIR)/$(am__dirstamp)
 src/syncevo/src_syncevo_libsyncevolution_la-icalstrdup.lo:  \
        src/syncevo/$(am__dirstamp) \
        src/syncevo/$(DEPDIR)/$(am__dirstamp)
+src/syncevo/src_syncevo_libsyncevolution_la-icaltz-util.lo:  \
+       src/syncevo/$(am__dirstamp) \
+       src/syncevo/$(DEPDIR)/$(am__dirstamp)
 src/syncevo/src_syncevo_libsyncevolution_la-ObexTransportAgent.lo:  \
        src/syncevo/$(am__dirstamp) \
        src/syncevo/$(DEPDIR)/$(am__dirstamp)
@@ -5281,14 +5403,13 @@ src/src_client_test-client-test-app.$(OBJEXT): src/$(am__dirstamp) \
        src/$(DEPDIR)/$(am__dirstamp)
 test/src_client_test-ClientTest.$(OBJEXT): test/$(am__dirstamp) \
        test/$(DEPDIR)/$(am__dirstamp)
+test/src_client_test-IcalTest.$(OBJEXT): test/$(am__dirstamp) \
+       test/$(DEPDIR)/$(am__dirstamp)
 test/src_client_test-client-test-main.$(OBJEXT): test/$(am__dirstamp) \
        test/$(DEPDIR)/$(am__dirstamp)
 src/backends/activesync/src_client_test-ActiveSyncSourceRegister.$(OBJEXT):  \
        src/backends/activesync/$(am__dirstamp) \
        src/backends/activesync/$(DEPDIR)/$(am__dirstamp)
-src/backends/addressbook/src_client_test-AddressBookSourceRegister.$(OBJEXT):  \
-       src/backends/addressbook/$(am__dirstamp) \
-       src/backends/addressbook/$(DEPDIR)/$(am__dirstamp)
 src/backends/akonadi/src_client_test-AkonadiSyncSourceRegister.$(OBJEXT):  \
        src/backends/akonadi/$(am__dirstamp) \
        src/backends/akonadi/$(DEPDIR)/$(am__dirstamp)
@@ -5316,6 +5437,9 @@ src/backends/kde/src_client_test-KDEPlatformRegister.$(OBJEXT):  \
 src/backends/maemo/src_client_test-MaemoCalendarSourceRegister.$(OBJEXT):  \
        src/backends/maemo/$(am__dirstamp) \
        src/backends/maemo/$(DEPDIR)/$(am__dirstamp)
+src/backends/oauth2/src_client_test-oauth2Register.$(OBJEXT):  \
+       src/backends/oauth2/$(am__dirstamp) \
+       src/backends/oauth2/$(DEPDIR)/$(am__dirstamp)
 src/backends/pbap/src_client_test-PbapSyncSourceRegister.$(OBJEXT):  \
        src/backends/pbap/$(am__dirstamp) \
        src/backends/pbap/$(DEPDIR)/$(am__dirstamp)
@@ -5357,18 +5481,6 @@ src/gdbus/test/src_gdbus_example-example.$(OBJEXT):  \
 src/gdbus/example$(EXEEXT): $(src_gdbus_example_OBJECTS) $(src_gdbus_example_DEPENDENCIES) $(EXTRA_src_gdbus_example_DEPENDENCIES) src/gdbus/$(am__dirstamp)
        @rm -f src/gdbus/example$(EXEEXT)
        $(AM_V_CXXLD)$(src_gdbus_example_LINK) $(src_gdbus_example_OBJECTS) $(src_gdbus_example_LDADD) $(LIBS)
-src/gdbusxx/test/$(am__dirstamp):
-       @$(MKDIR_P) src/gdbusxx/test
-       @: > src/gdbusxx/test/$(am__dirstamp)
-src/gdbusxx/test/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) src/gdbusxx/test/$(DEPDIR)
-       @: > src/gdbusxx/test/$(DEPDIR)/$(am__dirstamp)
-src/gdbusxx/test/src_gdbusxx_example-example.$(OBJEXT):  \
-       src/gdbusxx/test/$(am__dirstamp) \
-       src/gdbusxx/test/$(DEPDIR)/$(am__dirstamp)
-src/gdbusxx/example$(EXEEXT): $(src_gdbusxx_example_OBJECTS) $(src_gdbusxx_example_DEPENDENCIES) $(EXTRA_src_gdbusxx_example_DEPENDENCIES) src/gdbusxx/$(am__dirstamp)
-       @rm -f src/gdbusxx/example$(EXEEXT)
-       $(AM_V_CXXLD)$(src_gdbusxx_example_LINK) $(src_gdbusxx_example_OBJECTS) $(src_gdbusxx_example_LDADD) $(LIBS)
 src/gtk-ui/$(am__dirstamp):
        @$(MKDIR_P) src/gtk-ui
        @: > src/gtk-ui/$(am__dirstamp)
@@ -5501,9 +5613,6 @@ src/gtk3-ui/sync-ui-moblin$(EXEEXT): $(src_gtk3_ui_sync_ui_moblin_OBJECTS) $(src
 src/backends/activesync/src_syncevo_dbus_helper-ActiveSyncSourceRegister.$(OBJEXT):  \
        src/backends/activesync/$(am__dirstamp) \
        src/backends/activesync/$(DEPDIR)/$(am__dirstamp)
-src/backends/addressbook/src_syncevo_dbus_helper-AddressBookSourceRegister.$(OBJEXT):  \
-       src/backends/addressbook/$(am__dirstamp) \
-       src/backends/addressbook/$(DEPDIR)/$(am__dirstamp)
 src/backends/akonadi/src_syncevo_dbus_helper-AkonadiSyncSourceRegister.$(OBJEXT):  \
        src/backends/akonadi/$(am__dirstamp) \
        src/backends/akonadi/$(DEPDIR)/$(am__dirstamp)
@@ -5531,6 +5640,9 @@ src/backends/kde/src_syncevo_dbus_helper-KDEPlatformRegister.$(OBJEXT):  \
 src/backends/maemo/src_syncevo_dbus_helper-MaemoCalendarSourceRegister.$(OBJEXT):  \
        src/backends/maemo/$(am__dirstamp) \
        src/backends/maemo/$(DEPDIR)/$(am__dirstamp)
+src/backends/oauth2/src_syncevo_dbus_helper-oauth2Register.$(OBJEXT):  \
+       src/backends/oauth2/$(am__dirstamp) \
+       src/backends/oauth2/$(DEPDIR)/$(am__dirstamp)
 src/backends/pbap/src_syncevo_dbus_helper-PbapSyncSourceRegister.$(OBJEXT):  \
        src/backends/pbap/$(am__dirstamp) \
        src/backends/pbap/$(DEPDIR)/$(am__dirstamp)
@@ -5557,9 +5669,6 @@ src/syncevo-dbus-helper$(EXEEXT): $(src_syncevo_dbus_helper_OBJECTS) $(src_synce
 src/backends/activesync/src_syncevo_dbus_server-ActiveSyncSourceRegister.$(OBJEXT):  \
        src/backends/activesync/$(am__dirstamp) \
        src/backends/activesync/$(DEPDIR)/$(am__dirstamp)
-src/backends/addressbook/src_syncevo_dbus_server-AddressBookSourceRegister.$(OBJEXT):  \
-       src/backends/addressbook/$(am__dirstamp) \
-       src/backends/addressbook/$(DEPDIR)/$(am__dirstamp)
 src/backends/akonadi/src_syncevo_dbus_server-AkonadiSyncSourceRegister.$(OBJEXT):  \
        src/backends/akonadi/$(am__dirstamp) \
        src/backends/akonadi/$(DEPDIR)/$(am__dirstamp)
@@ -5587,6 +5696,9 @@ src/backends/kde/src_syncevo_dbus_server-KDEPlatformRegister.$(OBJEXT):  \
 src/backends/maemo/src_syncevo_dbus_server-MaemoCalendarSourceRegister.$(OBJEXT):  \
        src/backends/maemo/$(am__dirstamp) \
        src/backends/maemo/$(DEPDIR)/$(am__dirstamp)
+src/backends/oauth2/src_syncevo_dbus_server-oauth2Register.$(OBJEXT):  \
+       src/backends/oauth2/$(am__dirstamp) \
+       src/backends/oauth2/$(DEPDIR)/$(am__dirstamp)
 src/backends/pbap/src_syncevo_dbus_server-PbapSyncSourceRegister.$(OBJEXT):  \
        src/backends/pbap/$(am__dirstamp) \
        src/backends/pbap/$(DEPDIR)/$(am__dirstamp)
@@ -5615,9 +5727,6 @@ src/src_syncevo_local_sync-syncevo-local-sync.$(OBJEXT):  \
 src/backends/activesync/src_syncevo_local_sync-ActiveSyncSourceRegister.$(OBJEXT):  \
        src/backends/activesync/$(am__dirstamp) \
        src/backends/activesync/$(DEPDIR)/$(am__dirstamp)
-src/backends/addressbook/src_syncevo_local_sync-AddressBookSourceRegister.$(OBJEXT):  \
-       src/backends/addressbook/$(am__dirstamp) \
-       src/backends/addressbook/$(DEPDIR)/$(am__dirstamp)
 src/backends/akonadi/src_syncevo_local_sync-AkonadiSyncSourceRegister.$(OBJEXT):  \
        src/backends/akonadi/$(am__dirstamp) \
        src/backends/akonadi/$(DEPDIR)/$(am__dirstamp)
@@ -5645,6 +5754,9 @@ src/backends/kde/src_syncevo_local_sync-KDEPlatformRegister.$(OBJEXT):  \
 src/backends/maemo/src_syncevo_local_sync-MaemoCalendarSourceRegister.$(OBJEXT):  \
        src/backends/maemo/$(am__dirstamp) \
        src/backends/maemo/$(DEPDIR)/$(am__dirstamp)
+src/backends/oauth2/src_syncevo_local_sync-oauth2Register.$(OBJEXT):  \
+       src/backends/oauth2/$(am__dirstamp) \
+       src/backends/oauth2/$(DEPDIR)/$(am__dirstamp)
 src/backends/pbap/src_syncevo_local_sync-PbapSyncSourceRegister.$(OBJEXT):  \
        src/backends/pbap/$(am__dirstamp) \
        src/backends/pbap/$(DEPDIR)/$(am__dirstamp)
@@ -5673,9 +5785,6 @@ src/src_syncevolution-syncevolution.$(OBJEXT): src/$(am__dirstamp) \
 src/backends/activesync/src_syncevolution-ActiveSyncSourceRegister.$(OBJEXT):  \
        src/backends/activesync/$(am__dirstamp) \
        src/backends/activesync/$(DEPDIR)/$(am__dirstamp)
-src/backends/addressbook/src_syncevolution-AddressBookSourceRegister.$(OBJEXT):  \
-       src/backends/addressbook/$(am__dirstamp) \
-       src/backends/addressbook/$(DEPDIR)/$(am__dirstamp)
 src/backends/akonadi/src_syncevolution-AkonadiSyncSourceRegister.$(OBJEXT):  \
        src/backends/akonadi/$(am__dirstamp) \
        src/backends/akonadi/$(DEPDIR)/$(am__dirstamp)
@@ -5703,6 +5812,9 @@ src/backends/kde/src_syncevolution-KDEPlatformRegister.$(OBJEXT):  \
 src/backends/maemo/src_syncevolution-MaemoCalendarSourceRegister.$(OBJEXT):  \
        src/backends/maemo/$(am__dirstamp) \
        src/backends/maemo/$(DEPDIR)/$(am__dirstamp)
+src/backends/oauth2/src_syncevolution-oauth2Register.$(OBJEXT):  \
+       src/backends/oauth2/$(am__dirstamp) \
+       src/backends/oauth2/$(DEPDIR)/$(am__dirstamp)
 src/backends/pbap/src_syncevolution-PbapSyncSourceRegister.$(OBJEXT):  \
        src/backends/pbap/$(am__dirstamp) \
        src/backends/pbap/$(DEPDIR)/$(am__dirstamp)
@@ -5920,15 +6032,6 @@ mostlyclean-compile:
        -rm -f src/backends/activesync/src_syncevo_dbus_server-ActiveSyncSourceRegister.$(OBJEXT)
        -rm -f src/backends/activesync/src_syncevo_local_sync-ActiveSyncSourceRegister.$(OBJEXT)
        -rm -f src/backends/activesync/src_syncevolution-ActiveSyncSourceRegister.$(OBJEXT)
-       -rm -f src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookConstants.$(OBJEXT)
-       -rm -f src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookConstants.lo
-       -rm -f src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookSource.$(OBJEXT)
-       -rm -f src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookSource.lo
-       -rm -f src/backends/addressbook/src_client_test-AddressBookSourceRegister.$(OBJEXT)
-       -rm -f src/backends/addressbook/src_syncevo_dbus_helper-AddressBookSourceRegister.$(OBJEXT)
-       -rm -f src/backends/addressbook/src_syncevo_dbus_server-AddressBookSourceRegister.$(OBJEXT)
-       -rm -f src/backends/addressbook/src_syncevo_local_sync-AddressBookSourceRegister.$(OBJEXT)
-       -rm -f src/backends/addressbook/src_syncevolution-AddressBookSourceRegister.$(OBJEXT)
        -rm -f src/backends/akonadi/src_backends_akonadi_syncakonadi_la-akonadisyncsource.$(OBJEXT)
        -rm -f src/backends/akonadi/src_backends_akonadi_syncakonadi_la-akonadisyncsource.lo
        -rm -f src/backends/akonadi/src_client_test-AkonadiSyncSourceRegister.$(OBJEXT)
@@ -5942,8 +6045,6 @@ mostlyclean-compile:
        -rm -f src/backends/evolution/src_backends_evolution_syncebook_la-EvolutionSyncSource.lo
        -rm -f src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionCalendarSource.$(OBJEXT)
        -rm -f src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionCalendarSource.lo
-       -rm -f src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionMemoSource.$(OBJEXT)
-       -rm -f src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionMemoSource.lo
        -rm -f src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionSyncSource.$(OBJEXT)
        -rm -f src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionSyncSource.lo
        -rm -f src/backends/evolution/src_backends_evolution_syncecal_la-e-cal-check-timezones.$(OBJEXT)
@@ -6006,6 +6107,15 @@ mostlyclean-compile:
        -rm -f src/backends/maemo/src_syncevo_dbus_server-MaemoCalendarSourceRegister.$(OBJEXT)
        -rm -f src/backends/maemo/src_syncevo_local_sync-MaemoCalendarSourceRegister.$(OBJEXT)
        -rm -f src/backends/maemo/src_syncevolution-MaemoCalendarSourceRegister.$(OBJEXT)
+       -rm -f src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2.$(OBJEXT)
+       -rm -f src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2.lo
+       -rm -f src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2Register.$(OBJEXT)
+       -rm -f src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2Register.lo
+       -rm -f src/backends/oauth2/src_client_test-oauth2Register.$(OBJEXT)
+       -rm -f src/backends/oauth2/src_syncevo_dbus_helper-oauth2Register.$(OBJEXT)
+       -rm -f src/backends/oauth2/src_syncevo_dbus_server-oauth2Register.$(OBJEXT)
+       -rm -f src/backends/oauth2/src_syncevo_local_sync-oauth2Register.$(OBJEXT)
+       -rm -f src/backends/oauth2/src_syncevolution-oauth2Register.$(OBJEXT)
        -rm -f src/backends/pbap/src_backends_pbap_syncpbap_la-PbapSyncSource.$(OBJEXT)
        -rm -f src/backends/pbap/src_backends_pbap_syncpbap_la-PbapSyncSource.lo
        -rm -f src/backends/pbap/src_client_test-PbapSyncSourceRegister.$(OBJEXT)
@@ -6024,6 +6134,10 @@ mostlyclean-compile:
        -rm -f src/backends/signon/src_backends_signon_providergsso_la-signon.lo
        -rm -f src/backends/signon/src_backends_signon_providergsso_la-signonRegister.$(OBJEXT)
        -rm -f src/backends/signon/src_backends_signon_providergsso_la-signonRegister.lo
+       -rm -f src/backends/signon/src_backends_signon_providersignon_la-signon.$(OBJEXT)
+       -rm -f src/backends/signon/src_backends_signon_providersignon_la-signon.lo
+       -rm -f src/backends/signon/src_backends_signon_providersignon_la-signonRegister.$(OBJEXT)
+       -rm -f src/backends/signon/src_backends_signon_providersignon_la-signonRegister.lo
        -rm -f src/backends/signon/src_backends_signon_provideruoa_la-signon.$(OBJEXT)
        -rm -f src/backends/signon/src_backends_signon_provideruoa_la-signon.lo
        -rm -f src/backends/signon/src_backends_signon_provideruoa_la-signonRegister.$(OBJEXT)
@@ -6172,7 +6286,6 @@ mostlyclean-compile:
        -rm -f src/gdbus/test/src_gdbus_example-example.$(OBJEXT)
        -rm -f src/gdbusxx/src_gdbusxx_libgdbussyncevo_la-gdbus-cxx-bridge.$(OBJEXT)
        -rm -f src/gdbusxx/src_gdbusxx_libgdbussyncevo_la-gdbus-cxx-bridge.lo
-       -rm -f src/gdbusxx/test/src_gdbusxx_example-example.$(OBJEXT)
        -rm -f src/gnome-bluetooth/src_gnome_bluetooth_libgbtsyncevolution_la-syncevolution.$(OBJEXT)
        -rm -f src/gnome-bluetooth/src_gnome_bluetooth_libgbtsyncevolution_la-syncevolution.lo
        -rm -f src/gtk-ui/src_gtk_ui_sync_ui-gtkinfobar.$(OBJEXT)
@@ -6223,6 +6336,8 @@ mostlyclean-compile:
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-CurlTransportAgent.lo
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-EDSClient.$(OBJEXT)
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-EDSClient.lo
+       -rm -f src/syncevo/src_syncevo_libsyncevolution_la-Exception.$(OBJEXT)
+       -rm -f src/syncevo/src_syncevo_libsyncevolution_la-Exception.lo
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-FileConfigTree.$(OBJEXT)
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-FileConfigTree.lo
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-FileDataBlob.$(OBJEXT)
@@ -6233,6 +6348,8 @@ mostlyclean-compile:
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-ForkExec.lo
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-GLibSupport.$(OBJEXT)
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-GLibSupport.lo
+       -rm -f src/syncevo/src_syncevo_libsyncevolution_la-GVariantSupport.$(OBJEXT)
+       -rm -f src/syncevo/src_syncevo_libsyncevolution_la-GVariantSupport.lo
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-IdentityProvider.$(OBJEXT)
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-IdentityProvider.lo
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-IniConfigNode.$(OBJEXT)
@@ -6293,14 +6410,19 @@ mostlyclean-compile:
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-UserInterface.lo
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-eds_abi_wrapper.$(OBJEXT)
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-eds_abi_wrapper.lo
+       -rm -f src/syncevo/src_syncevo_libsyncevolution_la-gsignond-pipe-stream.$(OBJEXT)
+       -rm -f src/syncevo/src_syncevo_libsyncevolution_la-gsignond-pipe-stream.lo
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-icalstrdup.$(OBJEXT)
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-icalstrdup.lo
+       -rm -f src/syncevo/src_syncevo_libsyncevolution_la-icaltz-util.$(OBJEXT)
+       -rm -f src/syncevo/src_syncevo_libsyncevolution_la-icaltz-util.lo
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-lcs.$(OBJEXT)
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-lcs.lo
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-util.$(OBJEXT)
        -rm -f src/syncevo/src_syncevo_libsyncevolution_la-util.lo
        -rm -f test/src_abort_redirect-abort-redirect.$(OBJEXT)
        -rm -f test/src_client_test-ClientTest.$(OBJEXT)
+       -rm -f test/src_client_test-IcalTest.$(OBJEXT)
        -rm -f test/src_client_test-client-test-main.$(OBJEXT)
        -rm -f test/src_client_test-test.$(OBJEXT)
        -rm -f test/src_syncevo_dbus_helper-test.$(OBJEXT)
@@ -6323,13 +6445,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/activesync/$(DEPDIR)/src_syncevo_dbus_server-ActiveSyncSourceRegister.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/activesync/$(DEPDIR)/src_syncevo_local_sync-ActiveSyncSourceRegister.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/activesync/$(DEPDIR)/src_syncevolution-ActiveSyncSourceRegister.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/backends/addressbook/$(DEPDIR)/src_backends_addressbook_syncaddressbook_la-AddressBookConstants.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/backends/addressbook/$(DEPDIR)/src_backends_addressbook_syncaddressbook_la-AddressBookSource.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/backends/addressbook/$(DEPDIR)/src_client_test-AddressBookSourceRegister.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/backends/addressbook/$(DEPDIR)/src_syncevo_dbus_helper-AddressBookSourceRegister.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/backends/addressbook/$(DEPDIR)/src_syncevo_dbus_server-AddressBookSourceRegister.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/backends/addressbook/$(DEPDIR)/src_syncevo_local_sync-AddressBookSourceRegister.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/backends/addressbook/$(DEPDIR)/src_syncevolution-AddressBookSourceRegister.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/akonadi/$(DEPDIR)/src_backends_akonadi_syncakonadi_la-akonadisyncsource.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/akonadi/$(DEPDIR)/src_client_test-AkonadiSyncSourceRegister.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/akonadi/$(DEPDIR)/src_syncevo_dbus_helper-AkonadiSyncSourceRegister.Po@am__quote@
@@ -6339,7 +6454,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/evolution/$(DEPDIR)/src_backends_evolution_syncebook_la-EvolutionContactSource.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/evolution/$(DEPDIR)/src_backends_evolution_syncebook_la-EvolutionSyncSource.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/evolution/$(DEPDIR)/src_backends_evolution_syncecal_la-EvolutionCalendarSource.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/backends/evolution/$(DEPDIR)/src_backends_evolution_syncecal_la-EvolutionMemoSource.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/evolution/$(DEPDIR)/src_backends_evolution_syncecal_la-EvolutionSyncSource.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/evolution/$(DEPDIR)/src_backends_evolution_syncecal_la-e-cal-check-timezones.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/evolution/$(DEPDIR)/src_client_test-EvolutionCalendarSourceRegister.Po@am__quote@
@@ -6391,6 +6505,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/maemo/$(DEPDIR)/src_syncevo_dbus_server-MaemoCalendarSourceRegister.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/maemo/$(DEPDIR)/src_syncevo_local_sync-MaemoCalendarSourceRegister.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/maemo/$(DEPDIR)/src_syncevolution-MaemoCalendarSourceRegister.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/backends/oauth2/$(DEPDIR)/src_backends_oauth2_provideroauth2_la-oauth2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/backends/oauth2/$(DEPDIR)/src_backends_oauth2_provideroauth2_la-oauth2Register.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/backends/oauth2/$(DEPDIR)/src_client_test-oauth2Register.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/backends/oauth2/$(DEPDIR)/src_syncevo_dbus_helper-oauth2Register.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/backends/oauth2/$(DEPDIR)/src_syncevo_dbus_server-oauth2Register.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/backends/oauth2/$(DEPDIR)/src_syncevo_local_sync-oauth2Register.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/backends/oauth2/$(DEPDIR)/src_syncevolution-oauth2Register.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/pbap/$(DEPDIR)/src_backends_pbap_syncpbap_la-PbapSyncSource.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/pbap/$(DEPDIR)/src_client_test-PbapSyncSourceRegister.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/pbap/$(DEPDIR)/src_syncevo_dbus_helper-PbapSyncSourceRegister.Po@am__quote@
@@ -6405,6 +6526,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/qtcontacts/$(DEPDIR)/src_syncevolution-QtContactsSourceRegister.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/signon/$(DEPDIR)/src_backends_signon_providergsso_la-signon.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/signon/$(DEPDIR)/src_backends_signon_providergsso_la-signonRegister.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/backends/signon/$(DEPDIR)/src_backends_signon_providersignon_la-signon.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/backends/signon/$(DEPDIR)/src_backends_signon_providersignon_la-signonRegister.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/signon/$(DEPDIR)/src_backends_signon_provideruoa_la-signon.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/signon/$(DEPDIR)/src_backends_signon_provideruoa_la-signonRegister.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/backends/signon/$(DEPDIR)/src_client_test-signonRegister.Po@am__quote@
@@ -6490,7 +6613,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/gdbus/$(DEPDIR)/src_gdbus_libgdbussyncevo_la-watch.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/gdbus/test/$(DEPDIR)/src_gdbus_example-example.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/gdbusxx/$(DEPDIR)/src_gdbusxx_libgdbussyncevo_la-gdbus-cxx-bridge.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/gdbusxx/test/$(DEPDIR)/src_gdbusxx_example-example.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/gnome-bluetooth/$(DEPDIR)/src_gnome_bluetooth_libgbtsyncevolution_la-syncevolution.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/gtk-ui/$(DEPDIR)/src_gtk_ui_sync_ui-gtkinfobar.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/gtk-ui/$(DEPDIR)/src_gtk_ui_sync_ui-main.Po@am__quote@
@@ -6531,11 +6653,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-ConfigNode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-CurlTransportAgent.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-EDSClient.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-Exception.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-FileConfigTree.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-FileDataBlob.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-FilterConfigNode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-ForkExec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-GLibSupport.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-GVariantSupport.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-IdentityProvider.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-IniConfigNode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-LocalTransportAgent.Plo@am__quote@
@@ -6566,11 +6690,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-TransportAgent.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-UserInterface.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-eds_abi_wrapper.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-gsignond-pipe-stream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-icalstrdup.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-icaltz-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-lcs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/src_abort_redirect-abort-redirect.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/src_client_test-ClientTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/src_client_test-IcalTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/src_client_test-client-test-main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/src_client_test-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/src_syncevo_dbus_helper-test.Po@am__quote@
@@ -6681,6 +6808,13 @@ src/syncevo/src_syncevo_libsyncevolution_la-icalstrdup.lo: src/syncevo/icalstrdu
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_libsyncevolution_la_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_libsyncevolution_la_CFLAGS) $(CFLAGS) -c -o src/syncevo/src_syncevo_libsyncevolution_la-icalstrdup.lo `test -f 'src/syncevo/icalstrdup.c' || echo '$(srcdir)/'`src/syncevo/icalstrdup.c
 
+src/syncevo/src_syncevo_libsyncevolution_la-icaltz-util.lo: src/syncevo/icaltz-util.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_libsyncevolution_la_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_libsyncevolution_la_CFLAGS) $(CFLAGS) -MT src/syncevo/src_syncevo_libsyncevolution_la-icaltz-util.lo -MD -MP -MF src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-icaltz-util.Tpo -c -o src/syncevo/src_syncevo_libsyncevolution_la-icaltz-util.lo `test -f 'src/syncevo/icaltz-util.c' || echo '$(srcdir)/'`src/syncevo/icaltz-util.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-icaltz-util.Tpo src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-icaltz-util.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/syncevo/icaltz-util.c' object='src/syncevo/src_syncevo_libsyncevolution_la-icaltz-util.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_libsyncevolution_la_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_libsyncevolution_la_CFLAGS) $(CFLAGS) -c -o src/syncevo/src_syncevo_libsyncevolution_la-icaltz-util.lo `test -f 'src/syncevo/icaltz-util.c' || echo '$(srcdir)/'`src/syncevo/icaltz-util.c
+
 src/syncevo/src_syncevo_libsyncevolution_la-SyncEvolutionXML.lo: src/syncevo/SyncEvolutionXML.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_libsyncevolution_la_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_libsyncevolution_la_CFLAGS) $(CFLAGS) -MT src/syncevo/src_syncevo_libsyncevolution_la-SyncEvolutionXML.lo -MD -MP -MF src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-SyncEvolutionXML.Tpo -c -o src/syncevo/src_syncevo_libsyncevolution_la-SyncEvolutionXML.lo `test -f 'src/syncevo/SyncEvolutionXML.c' || echo '$(srcdir)/'`src/syncevo/SyncEvolutionXML.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-SyncEvolutionXML.Tpo src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-SyncEvolutionXML.Plo
@@ -7202,20 +7336,6 @@ src/backends/activesync/src_backends_activesync_syncactivesync_la-ActiveSyncCale
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_activesync_syncactivesync_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_activesync_syncactivesync_la_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/activesync/src_backends_activesync_syncactivesync_la-ActiveSyncCalendarSource.lo `test -f 'src/backends/activesync/ActiveSyncCalendarSource.cpp' || echo '$(srcdir)/'`src/backends/activesync/ActiveSyncCalendarSource.cpp
 
-src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookConstants.lo: src/backends/addressbook/AddressBookConstants.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_addressbook_syncaddressbook_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_addressbook_syncaddressbook_la_CXXFLAGS) $(CXXFLAGS) -MT src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookConstants.lo -MD -MP -MF src/backends/addressbook/$(DEPDIR)/src_backends_addressbook_syncaddressbook_la-AddressBookConstants.Tpo -c -o src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookConstants.lo `test -f 'src/backends/addressbook/AddressBookConstants.cpp' || echo '$(srcdir)/'`src/backends/addressbook/AddressBookConstants.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/addressbook/$(DEPDIR)/src_backends_addressbook_syncaddressbook_la-AddressBookConstants.Tpo src/backends/addressbook/$(DEPDIR)/src_backends_addressbook_syncaddressbook_la-AddressBookConstants.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/addressbook/AddressBookConstants.cpp' object='src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookConstants.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_addressbook_syncaddressbook_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_addressbook_syncaddressbook_la_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookConstants.lo `test -f 'src/backends/addressbook/AddressBookConstants.cpp' || echo '$(srcdir)/'`src/backends/addressbook/AddressBookConstants.cpp
-
-src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookSource.lo: src/backends/addressbook/AddressBookSource.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_addressbook_syncaddressbook_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_addressbook_syncaddressbook_la_CXXFLAGS) $(CXXFLAGS) -MT src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookSource.lo -MD -MP -MF src/backends/addressbook/$(DEPDIR)/src_backends_addressbook_syncaddressbook_la-AddressBookSource.Tpo -c -o src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookSource.lo `test -f 'src/backends/addressbook/AddressBookSource.cpp' || echo '$(srcdir)/'`src/backends/addressbook/AddressBookSource.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/addressbook/$(DEPDIR)/src_backends_addressbook_syncaddressbook_la-AddressBookSource.Tpo src/backends/addressbook/$(DEPDIR)/src_backends_addressbook_syncaddressbook_la-AddressBookSource.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/addressbook/AddressBookSource.cpp' object='src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookSource.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_addressbook_syncaddressbook_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_addressbook_syncaddressbook_la_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/addressbook/src_backends_addressbook_syncaddressbook_la-AddressBookSource.lo `test -f 'src/backends/addressbook/AddressBookSource.cpp' || echo '$(srcdir)/'`src/backends/addressbook/AddressBookSource.cpp
-
 src/backends/akonadi/src_backends_akonadi_syncakonadi_la-akonadisyncsource.lo: src/backends/akonadi/akonadisyncsource.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_akonadi_syncakonadi_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_akonadi_syncakonadi_la_CXXFLAGS) $(CXXFLAGS) -MT src/backends/akonadi/src_backends_akonadi_syncakonadi_la-akonadisyncsource.lo -MD -MP -MF src/backends/akonadi/$(DEPDIR)/src_backends_akonadi_syncakonadi_la-akonadisyncsource.Tpo -c -o src/backends/akonadi/src_backends_akonadi_syncakonadi_la-akonadisyncsource.lo `test -f 'src/backends/akonadi/akonadisyncsource.cpp' || echo '$(srcdir)/'`src/backends/akonadi/akonadisyncsource.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/akonadi/$(DEPDIR)/src_backends_akonadi_syncakonadi_la-akonadisyncsource.Tpo src/backends/akonadi/$(DEPDIR)/src_backends_akonadi_syncakonadi_la-akonadisyncsource.Plo
@@ -7251,13 +7371,6 @@ src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionCalendarSourc
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_evolution_syncecal_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_evolution_syncecal_la_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionCalendarSource.lo `test -f 'src/backends/evolution/EvolutionCalendarSource.cpp' || echo '$(srcdir)/'`src/backends/evolution/EvolutionCalendarSource.cpp
 
-src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionMemoSource.lo: src/backends/evolution/EvolutionMemoSource.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_evolution_syncecal_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_evolution_syncecal_la_CXXFLAGS) $(CXXFLAGS) -MT src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionMemoSource.lo -MD -MP -MF src/backends/evolution/$(DEPDIR)/src_backends_evolution_syncecal_la-EvolutionMemoSource.Tpo -c -o src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionMemoSource.lo `test -f 'src/backends/evolution/EvolutionMemoSource.cpp' || echo '$(srcdir)/'`src/backends/evolution/EvolutionMemoSource.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/evolution/$(DEPDIR)/src_backends_evolution_syncecal_la-EvolutionMemoSource.Tpo src/backends/evolution/$(DEPDIR)/src_backends_evolution_syncecal_la-EvolutionMemoSource.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/evolution/EvolutionMemoSource.cpp' object='src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionMemoSource.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_evolution_syncecal_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_evolution_syncecal_la_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/evolution/src_backends_evolution_syncecal_la-EvolutionMemoSource.lo `test -f 'src/backends/evolution/EvolutionMemoSource.cpp' || echo '$(srcdir)/'`src/backends/evolution/EvolutionMemoSource.cpp
-
 src/backends/file/src_backends_file_syncfile_la-FileSyncSource.lo: src/backends/file/FileSyncSource.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_file_syncfile_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_file_syncfile_la_CXXFLAGS) $(CXXFLAGS) -MT src/backends/file/src_backends_file_syncfile_la-FileSyncSource.lo -MD -MP -MF src/backends/file/$(DEPDIR)/src_backends_file_syncfile_la-FileSyncSource.Tpo -c -o src/backends/file/src_backends_file_syncfile_la-FileSyncSource.lo `test -f 'src/backends/file/FileSyncSource.cpp' || echo '$(srcdir)/'`src/backends/file/FileSyncSource.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/file/$(DEPDIR)/src_backends_file_syncfile_la-FileSyncSource.Tpo src/backends/file/$(DEPDIR)/src_backends_file_syncfile_la-FileSyncSource.Plo
@@ -7321,6 +7434,20 @@ src/backends/maemo/src_backends_maemo_syncmaemocal_la-MaemoCalendarSource.lo: sr
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_maemo_syncmaemocal_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_maemo_syncmaemocal_la_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/maemo/src_backends_maemo_syncmaemocal_la-MaemoCalendarSource.lo `test -f 'src/backends/maemo/MaemoCalendarSource.cpp' || echo '$(srcdir)/'`src/backends/maemo/MaemoCalendarSource.cpp
 
+src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2.lo: src/backends/oauth2/oauth2.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_oauth2_provideroauth2_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_oauth2_provideroauth2_la_CXXFLAGS) $(CXXFLAGS) -MT src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2.lo -MD -MP -MF src/backends/oauth2/$(DEPDIR)/src_backends_oauth2_provideroauth2_la-oauth2.Tpo -c -o src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2.lo `test -f 'src/backends/oauth2/oauth2.cpp' || echo '$(srcdir)/'`src/backends/oauth2/oauth2.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/oauth2/$(DEPDIR)/src_backends_oauth2_provideroauth2_la-oauth2.Tpo src/backends/oauth2/$(DEPDIR)/src_backends_oauth2_provideroauth2_la-oauth2.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/oauth2/oauth2.cpp' object='src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_oauth2_provideroauth2_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_oauth2_provideroauth2_la_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2.lo `test -f 'src/backends/oauth2/oauth2.cpp' || echo '$(srcdir)/'`src/backends/oauth2/oauth2.cpp
+
+src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2Register.lo: src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_oauth2_provideroauth2_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_oauth2_provideroauth2_la_CXXFLAGS) $(CXXFLAGS) -MT src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2Register.lo -MD -MP -MF src/backends/oauth2/$(DEPDIR)/src_backends_oauth2_provideroauth2_la-oauth2Register.Tpo -c -o src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2Register.lo `test -f 'src/backends/oauth2/oauth2Register.cpp' || echo '$(srcdir)/'`src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/oauth2/$(DEPDIR)/src_backends_oauth2_provideroauth2_la-oauth2Register.Tpo src/backends/oauth2/$(DEPDIR)/src_backends_oauth2_provideroauth2_la-oauth2Register.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/oauth2/oauth2Register.cpp' object='src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2Register.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_oauth2_provideroauth2_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_oauth2_provideroauth2_la_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/oauth2/src_backends_oauth2_provideroauth2_la-oauth2Register.lo `test -f 'src/backends/oauth2/oauth2Register.cpp' || echo '$(srcdir)/'`src/backends/oauth2/oauth2Register.cpp
+
 src/backends/pbap/src_backends_pbap_syncpbap_la-PbapSyncSource.lo: src/backends/pbap/PbapSyncSource.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_pbap_syncpbap_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_pbap_syncpbap_la_CXXFLAGS) $(CXXFLAGS) -MT src/backends/pbap/src_backends_pbap_syncpbap_la-PbapSyncSource.lo -MD -MP -MF src/backends/pbap/$(DEPDIR)/src_backends_pbap_syncpbap_la-PbapSyncSource.Tpo -c -o src/backends/pbap/src_backends_pbap_syncpbap_la-PbapSyncSource.lo `test -f 'src/backends/pbap/PbapSyncSource.cpp' || echo '$(srcdir)/'`src/backends/pbap/PbapSyncSource.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/pbap/$(DEPDIR)/src_backends_pbap_syncpbap_la-PbapSyncSource.Tpo src/backends/pbap/$(DEPDIR)/src_backends_pbap_syncpbap_la-PbapSyncSource.Plo
@@ -7349,6 +7476,20 @@ src/backends/signon/src_backends_signon_providergsso_la-signonRegister.lo: src/b
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_signon_providergsso_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_signon_providergsso_la_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/signon/src_backends_signon_providergsso_la-signonRegister.lo `test -f 'src/backends/signon/signonRegister.cpp' || echo '$(srcdir)/'`src/backends/signon/signonRegister.cpp
 
+src/backends/signon/src_backends_signon_providersignon_la-signon.lo: src/backends/signon/signon.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_signon_providersignon_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_signon_providersignon_la_CXXFLAGS) $(CXXFLAGS) -MT src/backends/signon/src_backends_signon_providersignon_la-signon.lo -MD -MP -MF src/backends/signon/$(DEPDIR)/src_backends_signon_providersignon_la-signon.Tpo -c -o src/backends/signon/src_backends_signon_providersignon_la-signon.lo `test -f 'src/backends/signon/signon.cpp' || echo '$(srcdir)/'`src/backends/signon/signon.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/signon/$(DEPDIR)/src_backends_signon_providersignon_la-signon.Tpo src/backends/signon/$(DEPDIR)/src_backends_signon_providersignon_la-signon.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/signon/signon.cpp' object='src/backends/signon/src_backends_signon_providersignon_la-signon.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_signon_providersignon_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_signon_providersignon_la_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/signon/src_backends_signon_providersignon_la-signon.lo `test -f 'src/backends/signon/signon.cpp' || echo '$(srcdir)/'`src/backends/signon/signon.cpp
+
+src/backends/signon/src_backends_signon_providersignon_la-signonRegister.lo: src/backends/signon/signonRegister.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_signon_providersignon_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_signon_providersignon_la_CXXFLAGS) $(CXXFLAGS) -MT src/backends/signon/src_backends_signon_providersignon_la-signonRegister.lo -MD -MP -MF src/backends/signon/$(DEPDIR)/src_backends_signon_providersignon_la-signonRegister.Tpo -c -o src/backends/signon/src_backends_signon_providersignon_la-signonRegister.lo `test -f 'src/backends/signon/signonRegister.cpp' || echo '$(srcdir)/'`src/backends/signon/signonRegister.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/signon/$(DEPDIR)/src_backends_signon_providersignon_la-signonRegister.Tpo src/backends/signon/$(DEPDIR)/src_backends_signon_providersignon_la-signonRegister.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/signon/signonRegister.cpp' object='src/backends/signon/src_backends_signon_providersignon_la-signonRegister.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_signon_providersignon_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_signon_providersignon_la_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/signon/src_backends_signon_providersignon_la-signonRegister.lo `test -f 'src/backends/signon/signonRegister.cpp' || echo '$(srcdir)/'`src/backends/signon/signonRegister.cpp
+
 src/backends/signon/src_backends_signon_provideruoa_la-signon.lo: src/backends/signon/signon.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_backends_signon_provideruoa_la_CPPFLAGS) $(CPPFLAGS) $(src_backends_signon_provideruoa_la_CXXFLAGS) $(CXXFLAGS) -MT src/backends/signon/src_backends_signon_provideruoa_la-signon.lo -MD -MP -MF src/backends/signon/$(DEPDIR)/src_backends_signon_provideruoa_la-signon.Tpo -c -o src/backends/signon/src_backends_signon_provideruoa_la-signon.lo `test -f 'src/backends/signon/signon.cpp' || echo '$(srcdir)/'`src/backends/signon/signon.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/signon/$(DEPDIR)/src_backends_signon_provideruoa_la-signon.Tpo src/backends/signon/$(DEPDIR)/src_backends_signon_provideruoa_la-signon.Plo
@@ -7776,6 +7917,13 @@ src/syncevo/src_syncevo_libsyncevolution_la-GLibSupport.lo: src/syncevo/GLibSupp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_libsyncevolution_la_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_libsyncevolution_la_CXXFLAGS) $(CXXFLAGS) -c -o src/syncevo/src_syncevo_libsyncevolution_la-GLibSupport.lo `test -f 'src/syncevo/GLibSupport.cpp' || echo '$(srcdir)/'`src/syncevo/GLibSupport.cpp
 
+src/syncevo/src_syncevo_libsyncevolution_la-GVariantSupport.lo: src/syncevo/GVariantSupport.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_libsyncevolution_la_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_libsyncevolution_la_CXXFLAGS) $(CXXFLAGS) -MT src/syncevo/src_syncevo_libsyncevolution_la-GVariantSupport.lo -MD -MP -MF src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-GVariantSupport.Tpo -c -o src/syncevo/src_syncevo_libsyncevolution_la-GVariantSupport.lo `test -f 'src/syncevo/GVariantSupport.cpp' || echo '$(srcdir)/'`src/syncevo/GVariantSupport.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-GVariantSupport.Tpo src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-GVariantSupport.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/syncevo/GVariantSupport.cpp' object='src/syncevo/src_syncevo_libsyncevolution_la-GVariantSupport.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_libsyncevolution_la_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_libsyncevolution_la_CXXFLAGS) $(CXXFLAGS) -c -o src/syncevo/src_syncevo_libsyncevolution_la-GVariantSupport.lo `test -f 'src/syncevo/GVariantSupport.cpp' || echo '$(srcdir)/'`src/syncevo/GVariantSupport.cpp
+
 src/syncevo/src_syncevo_libsyncevolution_la-SyncML.lo: src/syncevo/SyncML.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_libsyncevolution_la_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_libsyncevolution_la_CXXFLAGS) $(CXXFLAGS) -MT src/syncevo/src_syncevo_libsyncevolution_la-SyncML.lo -MD -MP -MF src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-SyncML.Tpo -c -o src/syncevo/src_syncevo_libsyncevolution_la-SyncML.lo `test -f 'src/syncevo/SyncML.cpp' || echo '$(srcdir)/'`src/syncevo/SyncML.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-SyncML.Tpo src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-SyncML.Plo
@@ -7853,6 +8001,13 @@ src/syncevo/src_syncevo_libsyncevolution_la-LocalTransportAgent.lo: src/syncevo/
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_libsyncevolution_la_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_libsyncevolution_la_CXXFLAGS) $(CXXFLAGS) -c -o src/syncevo/src_syncevo_libsyncevolution_la-LocalTransportAgent.lo `test -f 'src/syncevo/LocalTransportAgent.cpp' || echo '$(srcdir)/'`src/syncevo/LocalTransportAgent.cpp
 
+src/syncevo/src_syncevo_libsyncevolution_la-Exception.lo: src/syncevo/Exception.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_libsyncevolution_la_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_libsyncevolution_la_CXXFLAGS) $(CXXFLAGS) -MT src/syncevo/src_syncevo_libsyncevolution_la-Exception.lo -MD -MP -MF src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-Exception.Tpo -c -o src/syncevo/src_syncevo_libsyncevolution_la-Exception.lo `test -f 'src/syncevo/Exception.cpp' || echo '$(srcdir)/'`src/syncevo/Exception.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-Exception.Tpo src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-Exception.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/syncevo/Exception.cpp' object='src/syncevo/src_syncevo_libsyncevolution_la-Exception.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_libsyncevolution_la_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_libsyncevolution_la_CXXFLAGS) $(CXXFLAGS) -c -o src/syncevo/src_syncevo_libsyncevolution_la-Exception.lo `test -f 'src/syncevo/Exception.cpp' || echo '$(srcdir)/'`src/syncevo/Exception.cpp
+
 src/syncevo/src_syncevo_libsyncevolution_la-util.lo: src/syncevo/util.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_libsyncevolution_la_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_libsyncevolution_la_CXXFLAGS) $(CXXFLAGS) -MT src/syncevo/src_syncevo_libsyncevolution_la-util.lo -MD -MP -MF src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-util.Tpo -c -o src/syncevo/src_syncevo_libsyncevolution_la-util.lo `test -f 'src/syncevo/util.cpp' || echo '$(srcdir)/'`src/syncevo/util.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-util.Tpo src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-util.Plo
@@ -8021,6 +8176,13 @@ src/syncevo/src_syncevo_libsyncevolution_la-TrackingSyncSource.lo: src/syncevo/T
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_libsyncevolution_la_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_libsyncevolution_la_CXXFLAGS) $(CXXFLAGS) -c -o src/syncevo/src_syncevo_libsyncevolution_la-TrackingSyncSource.lo `test -f 'src/syncevo/TrackingSyncSource.cpp' || echo '$(srcdir)/'`src/syncevo/TrackingSyncSource.cpp
 
+src/syncevo/src_syncevo_libsyncevolution_la-gsignond-pipe-stream.lo: src/syncevo/gsignond-pipe-stream.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_libsyncevolution_la_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_libsyncevolution_la_CXXFLAGS) $(CXXFLAGS) -MT src/syncevo/src_syncevo_libsyncevolution_la-gsignond-pipe-stream.lo -MD -MP -MF src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-gsignond-pipe-stream.Tpo -c -o src/syncevo/src_syncevo_libsyncevolution_la-gsignond-pipe-stream.lo `test -f 'src/syncevo/gsignond-pipe-stream.cpp' || echo '$(srcdir)/'`src/syncevo/gsignond-pipe-stream.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-gsignond-pipe-stream.Tpo src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-gsignond-pipe-stream.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/syncevo/gsignond-pipe-stream.cpp' object='src/syncevo/src_syncevo_libsyncevolution_la-gsignond-pipe-stream.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_libsyncevolution_la_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_libsyncevolution_la_CXXFLAGS) $(CXXFLAGS) -c -o src/syncevo/src_syncevo_libsyncevolution_la-gsignond-pipe-stream.lo `test -f 'src/syncevo/gsignond-pipe-stream.cpp' || echo '$(srcdir)/'`src/syncevo/gsignond-pipe-stream.cpp
+
 src/syncevo/src_syncevo_libsyncevolution_la-ObexTransportAgent.lo: src/syncevo/ObexTransportAgent.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_libsyncevolution_la_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_libsyncevolution_la_CXXFLAGS) $(CXXFLAGS) -MT src/syncevo/src_syncevo_libsyncevolution_la-ObexTransportAgent.lo -MD -MP -MF src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-ObexTransportAgent.Tpo -c -o src/syncevo/src_syncevo_libsyncevolution_la-ObexTransportAgent.lo `test -f 'src/syncevo/ObexTransportAgent.cpp' || echo '$(srcdir)/'`src/syncevo/ObexTransportAgent.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-ObexTransportAgent.Tpo src/syncevo/$(DEPDIR)/src_syncevo_libsyncevolution_la-ObexTransportAgent.Plo
@@ -8070,6 +8232,20 @@ test/src_client_test-ClientTest.obj: test/ClientTest.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -c -o test/src_client_test-ClientTest.obj `if test -f 'test/ClientTest.cpp'; then $(CYGPATH_W) 'test/ClientTest.cpp'; else $(CYGPATH_W) '$(srcdir)/test/ClientTest.cpp'; fi`
 
+test/src_client_test-IcalTest.o: test/IcalTest.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -MT test/src_client_test-IcalTest.o -MD -MP -MF test/$(DEPDIR)/src_client_test-IcalTest.Tpo -c -o test/src_client_test-IcalTest.o `test -f 'test/IcalTest.cpp' || echo '$(srcdir)/'`test/IcalTest.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) test/$(DEPDIR)/src_client_test-IcalTest.Tpo test/$(DEPDIR)/src_client_test-IcalTest.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test/IcalTest.cpp' object='test/src_client_test-IcalTest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -c -o test/src_client_test-IcalTest.o `test -f 'test/IcalTest.cpp' || echo '$(srcdir)/'`test/IcalTest.cpp
+
+test/src_client_test-IcalTest.obj: test/IcalTest.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -MT test/src_client_test-IcalTest.obj -MD -MP -MF test/$(DEPDIR)/src_client_test-IcalTest.Tpo -c -o test/src_client_test-IcalTest.obj `if test -f 'test/IcalTest.cpp'; then $(CYGPATH_W) 'test/IcalTest.cpp'; else $(CYGPATH_W) '$(srcdir)/test/IcalTest.cpp'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) test/$(DEPDIR)/src_client_test-IcalTest.Tpo test/$(DEPDIR)/src_client_test-IcalTest.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='test/IcalTest.cpp' object='test/src_client_test-IcalTest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -c -o test/src_client_test-IcalTest.obj `if test -f 'test/IcalTest.cpp'; then $(CYGPATH_W) 'test/IcalTest.cpp'; else $(CYGPATH_W) '$(srcdir)/test/IcalTest.cpp'; fi`
+
 test/src_client_test-client-test-main.o: test/client-test-main.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -MT test/src_client_test-client-test-main.o -MD -MP -MF test/$(DEPDIR)/src_client_test-client-test-main.Tpo -c -o test/src_client_test-client-test-main.o `test -f 'test/client-test-main.cpp' || echo '$(srcdir)/'`test/client-test-main.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) test/$(DEPDIR)/src_client_test-client-test-main.Tpo test/$(DEPDIR)/src_client_test-client-test-main.Po
@@ -8098,20 +8274,6 @@ src/backends/activesync/src_client_test-ActiveSyncSourceRegister.obj: src/backen
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/activesync/src_client_test-ActiveSyncSourceRegister.obj `if test -f 'src/backends/activesync/ActiveSyncSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/activesync/ActiveSyncSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/activesync/ActiveSyncSourceRegister.cpp'; fi`
 
-src/backends/addressbook/src_client_test-AddressBookSourceRegister.o: src/backends/addressbook/AddressBookSourceRegister.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -MT src/backends/addressbook/src_client_test-AddressBookSourceRegister.o -MD -MP -MF src/backends/addressbook/$(DEPDIR)/src_client_test-AddressBookSourceRegister.Tpo -c -o src/backends/addressbook/src_client_test-AddressBookSourceRegister.o `test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/addressbook/AddressBookSourceRegister.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/addressbook/$(DEPDIR)/src_client_test-AddressBookSourceRegister.Tpo src/backends/addressbook/$(DEPDIR)/src_client_test-AddressBookSourceRegister.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/addressbook/AddressBookSourceRegister.cpp' object='src/backends/addressbook/src_client_test-AddressBookSourceRegister.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/addressbook/src_client_test-AddressBookSourceRegister.o `test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/addressbook/AddressBookSourceRegister.cpp
-
-src/backends/addressbook/src_client_test-AddressBookSourceRegister.obj: src/backends/addressbook/AddressBookSourceRegister.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -MT src/backends/addressbook/src_client_test-AddressBookSourceRegister.obj -MD -MP -MF src/backends/addressbook/$(DEPDIR)/src_client_test-AddressBookSourceRegister.Tpo -c -o src/backends/addressbook/src_client_test-AddressBookSourceRegister.obj `if test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/addressbook/AddressBookSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/addressbook/AddressBookSourceRegister.cpp'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/addressbook/$(DEPDIR)/src_client_test-AddressBookSourceRegister.Tpo src/backends/addressbook/$(DEPDIR)/src_client_test-AddressBookSourceRegister.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/addressbook/AddressBookSourceRegister.cpp' object='src/backends/addressbook/src_client_test-AddressBookSourceRegister.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/addressbook/src_client_test-AddressBookSourceRegister.obj `if test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/addressbook/AddressBookSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/addressbook/AddressBookSourceRegister.cpp'; fi`
-
 src/backends/akonadi/src_client_test-AkonadiSyncSourceRegister.o: src/backends/akonadi/AkonadiSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -MT src/backends/akonadi/src_client_test-AkonadiSyncSourceRegister.o -MD -MP -MF src/backends/akonadi/$(DEPDIR)/src_client_test-AkonadiSyncSourceRegister.Tpo -c -o src/backends/akonadi/src_client_test-AkonadiSyncSourceRegister.o `test -f 'src/backends/akonadi/AkonadiSyncSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/akonadi/AkonadiSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/akonadi/$(DEPDIR)/src_client_test-AkonadiSyncSourceRegister.Tpo src/backends/akonadi/$(DEPDIR)/src_client_test-AkonadiSyncSourceRegister.Po
@@ -8238,6 +8400,20 @@ src/backends/maemo/src_client_test-MaemoCalendarSourceRegister.obj: src/backends
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/maemo/src_client_test-MaemoCalendarSourceRegister.obj `if test -f 'src/backends/maemo/MaemoCalendarSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/maemo/MaemoCalendarSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/maemo/MaemoCalendarSourceRegister.cpp'; fi`
 
+src/backends/oauth2/src_client_test-oauth2Register.o: src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -MT src/backends/oauth2/src_client_test-oauth2Register.o -MD -MP -MF src/backends/oauth2/$(DEPDIR)/src_client_test-oauth2Register.Tpo -c -o src/backends/oauth2/src_client_test-oauth2Register.o `test -f 'src/backends/oauth2/oauth2Register.cpp' || echo '$(srcdir)/'`src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/oauth2/$(DEPDIR)/src_client_test-oauth2Register.Tpo src/backends/oauth2/$(DEPDIR)/src_client_test-oauth2Register.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/oauth2/oauth2Register.cpp' object='src/backends/oauth2/src_client_test-oauth2Register.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/oauth2/src_client_test-oauth2Register.o `test -f 'src/backends/oauth2/oauth2Register.cpp' || echo '$(srcdir)/'`src/backends/oauth2/oauth2Register.cpp
+
+src/backends/oauth2/src_client_test-oauth2Register.obj: src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -MT src/backends/oauth2/src_client_test-oauth2Register.obj -MD -MP -MF src/backends/oauth2/$(DEPDIR)/src_client_test-oauth2Register.Tpo -c -o src/backends/oauth2/src_client_test-oauth2Register.obj `if test -f 'src/backends/oauth2/oauth2Register.cpp'; then $(CYGPATH_W) 'src/backends/oauth2/oauth2Register.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/oauth2/oauth2Register.cpp'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/oauth2/$(DEPDIR)/src_client_test-oauth2Register.Tpo src/backends/oauth2/$(DEPDIR)/src_client_test-oauth2Register.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/oauth2/oauth2Register.cpp' object='src/backends/oauth2/src_client_test-oauth2Register.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/oauth2/src_client_test-oauth2Register.obj `if test -f 'src/backends/oauth2/oauth2Register.cpp'; then $(CYGPATH_W) 'src/backends/oauth2/oauth2Register.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/oauth2/oauth2Register.cpp'; fi`
+
 src/backends/pbap/src_client_test-PbapSyncSourceRegister.o: src/backends/pbap/PbapSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_client_test_CPPFLAGS) $(CPPFLAGS) $(src_client_test_CXXFLAGS) $(CXXFLAGS) -MT src/backends/pbap/src_client_test-PbapSyncSourceRegister.o -MD -MP -MF src/backends/pbap/$(DEPDIR)/src_client_test-PbapSyncSourceRegister.Tpo -c -o src/backends/pbap/src_client_test-PbapSyncSourceRegister.o `test -f 'src/backends/pbap/PbapSyncSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/pbap/PbapSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/pbap/$(DEPDIR)/src_client_test-PbapSyncSourceRegister.Tpo src/backends/pbap/$(DEPDIR)/src_client_test-PbapSyncSourceRegister.Po
@@ -8350,20 +8526,6 @@ src/gdbus/test/src_gdbus_example-example.obj: src/gdbus/test/example.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_gdbus_example_CPPFLAGS) $(CPPFLAGS) $(src_gdbus_example_CXXFLAGS) $(CXXFLAGS) -c -o src/gdbus/test/src_gdbus_example-example.obj `if test -f 'src/gdbus/test/example.cpp'; then $(CYGPATH_W) 'src/gdbus/test/example.cpp'; else $(CYGPATH_W) '$(srcdir)/src/gdbus/test/example.cpp'; fi`
 
-src/gdbusxx/test/src_gdbusxx_example-example.o: src/gdbusxx/test/example.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_gdbusxx_example_CPPFLAGS) $(CPPFLAGS) $(src_gdbusxx_example_CXXFLAGS) $(CXXFLAGS) -MT src/gdbusxx/test/src_gdbusxx_example-example.o -MD -MP -MF src/gdbusxx/test/$(DEPDIR)/src_gdbusxx_example-example.Tpo -c -o src/gdbusxx/test/src_gdbusxx_example-example.o `test -f 'src/gdbusxx/test/example.cpp' || echo '$(srcdir)/'`src/gdbusxx/test/example.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/gdbusxx/test/$(DEPDIR)/src_gdbusxx_example-example.Tpo src/gdbusxx/test/$(DEPDIR)/src_gdbusxx_example-example.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/gdbusxx/test/example.cpp' object='src/gdbusxx/test/src_gdbusxx_example-example.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_gdbusxx_example_CPPFLAGS) $(CPPFLAGS) $(src_gdbusxx_example_CXXFLAGS) $(CXXFLAGS) -c -o src/gdbusxx/test/src_gdbusxx_example-example.o `test -f 'src/gdbusxx/test/example.cpp' || echo '$(srcdir)/'`src/gdbusxx/test/example.cpp
-
-src/gdbusxx/test/src_gdbusxx_example-example.obj: src/gdbusxx/test/example.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_gdbusxx_example_CPPFLAGS) $(CPPFLAGS) $(src_gdbusxx_example_CXXFLAGS) $(CXXFLAGS) -MT src/gdbusxx/test/src_gdbusxx_example-example.obj -MD -MP -MF src/gdbusxx/test/$(DEPDIR)/src_gdbusxx_example-example.Tpo -c -o src/gdbusxx/test/src_gdbusxx_example-example.obj `if test -f 'src/gdbusxx/test/example.cpp'; then $(CYGPATH_W) 'src/gdbusxx/test/example.cpp'; else $(CYGPATH_W) '$(srcdir)/src/gdbusxx/test/example.cpp'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/gdbusxx/test/$(DEPDIR)/src_gdbusxx_example-example.Tpo src/gdbusxx/test/$(DEPDIR)/src_gdbusxx_example-example.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/gdbusxx/test/example.cpp' object='src/gdbusxx/test/src_gdbusxx_example-example.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_gdbusxx_example_CPPFLAGS) $(CPPFLAGS) $(src_gdbusxx_example_CXXFLAGS) $(CXXFLAGS) -c -o src/gdbusxx/test/src_gdbusxx_example-example.obj `if test -f 'src/gdbusxx/test/example.cpp'; then $(CYGPATH_W) 'src/gdbusxx/test/example.cpp'; else $(CYGPATH_W) '$(srcdir)/src/gdbusxx/test/example.cpp'; fi`
-
 src/backends/activesync/src_syncevo_dbus_helper-ActiveSyncSourceRegister.o: src/backends/activesync/ActiveSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_helper_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_helper_CXXFLAGS) $(CXXFLAGS) -MT src/backends/activesync/src_syncevo_dbus_helper-ActiveSyncSourceRegister.o -MD -MP -MF src/backends/activesync/$(DEPDIR)/src_syncevo_dbus_helper-ActiveSyncSourceRegister.Tpo -c -o src/backends/activesync/src_syncevo_dbus_helper-ActiveSyncSourceRegister.o `test -f 'src/backends/activesync/ActiveSyncSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/activesync/ActiveSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/activesync/$(DEPDIR)/src_syncevo_dbus_helper-ActiveSyncSourceRegister.Tpo src/backends/activesync/$(DEPDIR)/src_syncevo_dbus_helper-ActiveSyncSourceRegister.Po
@@ -8378,20 +8540,6 @@ src/backends/activesync/src_syncevo_dbus_helper-ActiveSyncSourceRegister.obj: sr
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_helper_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_helper_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/activesync/src_syncevo_dbus_helper-ActiveSyncSourceRegister.obj `if test -f 'src/backends/activesync/ActiveSyncSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/activesync/ActiveSyncSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/activesync/ActiveSyncSourceRegister.cpp'; fi`
 
-src/backends/addressbook/src_syncevo_dbus_helper-AddressBookSourceRegister.o: src/backends/addressbook/AddressBookSourceRegister.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_helper_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_helper_CXXFLAGS) $(CXXFLAGS) -MT src/backends/addressbook/src_syncevo_dbus_helper-AddressBookSourceRegister.o -MD -MP -MF src/backends/addressbook/$(DEPDIR)/src_syncevo_dbus_helper-AddressBookSourceRegister.Tpo -c -o src/backends/addressbook/src_syncevo_dbus_helper-AddressBookSourceRegister.o `test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/addressbook/AddressBookSourceRegister.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/addressbook/$(DEPDIR)/src_syncevo_dbus_helper-AddressBookSourceRegister.Tpo src/backends/addressbook/$(DEPDIR)/src_syncevo_dbus_helper-AddressBookSourceRegister.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/addressbook/AddressBookSourceRegister.cpp' object='src/backends/addressbook/src_syncevo_dbus_helper-AddressBookSourceRegister.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_helper_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_helper_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/addressbook/src_syncevo_dbus_helper-AddressBookSourceRegister.o `test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/addressbook/AddressBookSourceRegister.cpp
-
-src/backends/addressbook/src_syncevo_dbus_helper-AddressBookSourceRegister.obj: src/backends/addressbook/AddressBookSourceRegister.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_helper_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_helper_CXXFLAGS) $(CXXFLAGS) -MT src/backends/addressbook/src_syncevo_dbus_helper-AddressBookSourceRegister.obj -MD -MP -MF src/backends/addressbook/$(DEPDIR)/src_syncevo_dbus_helper-AddressBookSourceRegister.Tpo -c -o src/backends/addressbook/src_syncevo_dbus_helper-AddressBookSourceRegister.obj `if test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/addressbook/AddressBookSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/addressbook/AddressBookSourceRegister.cpp'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/addressbook/$(DEPDIR)/src_syncevo_dbus_helper-AddressBookSourceRegister.Tpo src/backends/addressbook/$(DEPDIR)/src_syncevo_dbus_helper-AddressBookSourceRegister.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/addressbook/AddressBookSourceRegister.cpp' object='src/backends/addressbook/src_syncevo_dbus_helper-AddressBookSourceRegister.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_helper_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_helper_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/addressbook/src_syncevo_dbus_helper-AddressBookSourceRegister.obj `if test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/addressbook/AddressBookSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/addressbook/AddressBookSourceRegister.cpp'; fi`
-
 src/backends/akonadi/src_syncevo_dbus_helper-AkonadiSyncSourceRegister.o: src/backends/akonadi/AkonadiSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_helper_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_helper_CXXFLAGS) $(CXXFLAGS) -MT src/backends/akonadi/src_syncevo_dbus_helper-AkonadiSyncSourceRegister.o -MD -MP -MF src/backends/akonadi/$(DEPDIR)/src_syncevo_dbus_helper-AkonadiSyncSourceRegister.Tpo -c -o src/backends/akonadi/src_syncevo_dbus_helper-AkonadiSyncSourceRegister.o `test -f 'src/backends/akonadi/AkonadiSyncSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/akonadi/AkonadiSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/akonadi/$(DEPDIR)/src_syncevo_dbus_helper-AkonadiSyncSourceRegister.Tpo src/backends/akonadi/$(DEPDIR)/src_syncevo_dbus_helper-AkonadiSyncSourceRegister.Po
@@ -8518,6 +8666,20 @@ src/backends/maemo/src_syncevo_dbus_helper-MaemoCalendarSourceRegister.obj: src/
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_helper_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_helper_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/maemo/src_syncevo_dbus_helper-MaemoCalendarSourceRegister.obj `if test -f 'src/backends/maemo/MaemoCalendarSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/maemo/MaemoCalendarSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/maemo/MaemoCalendarSourceRegister.cpp'; fi`
 
+src/backends/oauth2/src_syncevo_dbus_helper-oauth2Register.o: src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_helper_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_helper_CXXFLAGS) $(CXXFLAGS) -MT src/backends/oauth2/src_syncevo_dbus_helper-oauth2Register.o -MD -MP -MF src/backends/oauth2/$(DEPDIR)/src_syncevo_dbus_helper-oauth2Register.Tpo -c -o src/backends/oauth2/src_syncevo_dbus_helper-oauth2Register.o `test -f 'src/backends/oauth2/oauth2Register.cpp' || echo '$(srcdir)/'`src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/oauth2/$(DEPDIR)/src_syncevo_dbus_helper-oauth2Register.Tpo src/backends/oauth2/$(DEPDIR)/src_syncevo_dbus_helper-oauth2Register.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/oauth2/oauth2Register.cpp' object='src/backends/oauth2/src_syncevo_dbus_helper-oauth2Register.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_helper_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_helper_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/oauth2/src_syncevo_dbus_helper-oauth2Register.o `test -f 'src/backends/oauth2/oauth2Register.cpp' || echo '$(srcdir)/'`src/backends/oauth2/oauth2Register.cpp
+
+src/backends/oauth2/src_syncevo_dbus_helper-oauth2Register.obj: src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_helper_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_helper_CXXFLAGS) $(CXXFLAGS) -MT src/backends/oauth2/src_syncevo_dbus_helper-oauth2Register.obj -MD -MP -MF src/backends/oauth2/$(DEPDIR)/src_syncevo_dbus_helper-oauth2Register.Tpo -c -o src/backends/oauth2/src_syncevo_dbus_helper-oauth2Register.obj `if test -f 'src/backends/oauth2/oauth2Register.cpp'; then $(CYGPATH_W) 'src/backends/oauth2/oauth2Register.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/oauth2/oauth2Register.cpp'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/oauth2/$(DEPDIR)/src_syncevo_dbus_helper-oauth2Register.Tpo src/backends/oauth2/$(DEPDIR)/src_syncevo_dbus_helper-oauth2Register.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/oauth2/oauth2Register.cpp' object='src/backends/oauth2/src_syncevo_dbus_helper-oauth2Register.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_helper_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_helper_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/oauth2/src_syncevo_dbus_helper-oauth2Register.obj `if test -f 'src/backends/oauth2/oauth2Register.cpp'; then $(CYGPATH_W) 'src/backends/oauth2/oauth2Register.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/oauth2/oauth2Register.cpp'; fi`
+
 src/backends/pbap/src_syncevo_dbus_helper-PbapSyncSourceRegister.o: src/backends/pbap/PbapSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_helper_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_helper_CXXFLAGS) $(CXXFLAGS) -MT src/backends/pbap/src_syncevo_dbus_helper-PbapSyncSourceRegister.o -MD -MP -MF src/backends/pbap/$(DEPDIR)/src_syncevo_dbus_helper-PbapSyncSourceRegister.Tpo -c -o src/backends/pbap/src_syncevo_dbus_helper-PbapSyncSourceRegister.o `test -f 'src/backends/pbap/PbapSyncSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/pbap/PbapSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/pbap/$(DEPDIR)/src_syncevo_dbus_helper-PbapSyncSourceRegister.Tpo src/backends/pbap/$(DEPDIR)/src_syncevo_dbus_helper-PbapSyncSourceRegister.Po
@@ -8630,20 +8792,6 @@ src/backends/activesync/src_syncevo_dbus_server-ActiveSyncSourceRegister.obj: sr
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_server_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_server_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/activesync/src_syncevo_dbus_server-ActiveSyncSourceRegister.obj `if test -f 'src/backends/activesync/ActiveSyncSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/activesync/ActiveSyncSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/activesync/ActiveSyncSourceRegister.cpp'; fi`
 
-src/backends/addressbook/src_syncevo_dbus_server-AddressBookSourceRegister.o: src/backends/addressbook/AddressBookSourceRegister.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_server_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_server_CXXFLAGS) $(CXXFLAGS) -MT src/backends/addressbook/src_syncevo_dbus_server-AddressBookSourceRegister.o -MD -MP -MF src/backends/addressbook/$(DEPDIR)/src_syncevo_dbus_server-AddressBookSourceRegister.Tpo -c -o src/backends/addressbook/src_syncevo_dbus_server-AddressBookSourceRegister.o `test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/addressbook/AddressBookSourceRegister.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/addressbook/$(DEPDIR)/src_syncevo_dbus_server-AddressBookSourceRegister.Tpo src/backends/addressbook/$(DEPDIR)/src_syncevo_dbus_server-AddressBookSourceRegister.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/addressbook/AddressBookSourceRegister.cpp' object='src/backends/addressbook/src_syncevo_dbus_server-AddressBookSourceRegister.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_server_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_server_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/addressbook/src_syncevo_dbus_server-AddressBookSourceRegister.o `test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/addressbook/AddressBookSourceRegister.cpp
-
-src/backends/addressbook/src_syncevo_dbus_server-AddressBookSourceRegister.obj: src/backends/addressbook/AddressBookSourceRegister.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_server_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_server_CXXFLAGS) $(CXXFLAGS) -MT src/backends/addressbook/src_syncevo_dbus_server-AddressBookSourceRegister.obj -MD -MP -MF src/backends/addressbook/$(DEPDIR)/src_syncevo_dbus_server-AddressBookSourceRegister.Tpo -c -o src/backends/addressbook/src_syncevo_dbus_server-AddressBookSourceRegister.obj `if test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/addressbook/AddressBookSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/addressbook/AddressBookSourceRegister.cpp'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/addressbook/$(DEPDIR)/src_syncevo_dbus_server-AddressBookSourceRegister.Tpo src/backends/addressbook/$(DEPDIR)/src_syncevo_dbus_server-AddressBookSourceRegister.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/addressbook/AddressBookSourceRegister.cpp' object='src/backends/addressbook/src_syncevo_dbus_server-AddressBookSourceRegister.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_server_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_server_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/addressbook/src_syncevo_dbus_server-AddressBookSourceRegister.obj `if test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/addressbook/AddressBookSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/addressbook/AddressBookSourceRegister.cpp'; fi`
-
 src/backends/akonadi/src_syncevo_dbus_server-AkonadiSyncSourceRegister.o: src/backends/akonadi/AkonadiSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_server_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_server_CXXFLAGS) $(CXXFLAGS) -MT src/backends/akonadi/src_syncevo_dbus_server-AkonadiSyncSourceRegister.o -MD -MP -MF src/backends/akonadi/$(DEPDIR)/src_syncevo_dbus_server-AkonadiSyncSourceRegister.Tpo -c -o src/backends/akonadi/src_syncevo_dbus_server-AkonadiSyncSourceRegister.o `test -f 'src/backends/akonadi/AkonadiSyncSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/akonadi/AkonadiSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/akonadi/$(DEPDIR)/src_syncevo_dbus_server-AkonadiSyncSourceRegister.Tpo src/backends/akonadi/$(DEPDIR)/src_syncevo_dbus_server-AkonadiSyncSourceRegister.Po
@@ -8770,6 +8918,20 @@ src/backends/maemo/src_syncevo_dbus_server-MaemoCalendarSourceRegister.obj: src/
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_server_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_server_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/maemo/src_syncevo_dbus_server-MaemoCalendarSourceRegister.obj `if test -f 'src/backends/maemo/MaemoCalendarSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/maemo/MaemoCalendarSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/maemo/MaemoCalendarSourceRegister.cpp'; fi`
 
+src/backends/oauth2/src_syncevo_dbus_server-oauth2Register.o: src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_server_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_server_CXXFLAGS) $(CXXFLAGS) -MT src/backends/oauth2/src_syncevo_dbus_server-oauth2Register.o -MD -MP -MF src/backends/oauth2/$(DEPDIR)/src_syncevo_dbus_server-oauth2Register.Tpo -c -o src/backends/oauth2/src_syncevo_dbus_server-oauth2Register.o `test -f 'src/backends/oauth2/oauth2Register.cpp' || echo '$(srcdir)/'`src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/oauth2/$(DEPDIR)/src_syncevo_dbus_server-oauth2Register.Tpo src/backends/oauth2/$(DEPDIR)/src_syncevo_dbus_server-oauth2Register.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/oauth2/oauth2Register.cpp' object='src/backends/oauth2/src_syncevo_dbus_server-oauth2Register.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_server_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_server_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/oauth2/src_syncevo_dbus_server-oauth2Register.o `test -f 'src/backends/oauth2/oauth2Register.cpp' || echo '$(srcdir)/'`src/backends/oauth2/oauth2Register.cpp
+
+src/backends/oauth2/src_syncevo_dbus_server-oauth2Register.obj: src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_server_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_server_CXXFLAGS) $(CXXFLAGS) -MT src/backends/oauth2/src_syncevo_dbus_server-oauth2Register.obj -MD -MP -MF src/backends/oauth2/$(DEPDIR)/src_syncevo_dbus_server-oauth2Register.Tpo -c -o src/backends/oauth2/src_syncevo_dbus_server-oauth2Register.obj `if test -f 'src/backends/oauth2/oauth2Register.cpp'; then $(CYGPATH_W) 'src/backends/oauth2/oauth2Register.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/oauth2/oauth2Register.cpp'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/oauth2/$(DEPDIR)/src_syncevo_dbus_server-oauth2Register.Tpo src/backends/oauth2/$(DEPDIR)/src_syncevo_dbus_server-oauth2Register.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/oauth2/oauth2Register.cpp' object='src/backends/oauth2/src_syncevo_dbus_server-oauth2Register.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_server_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_server_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/oauth2/src_syncevo_dbus_server-oauth2Register.obj `if test -f 'src/backends/oauth2/oauth2Register.cpp'; then $(CYGPATH_W) 'src/backends/oauth2/oauth2Register.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/oauth2/oauth2Register.cpp'; fi`
+
 src/backends/pbap/src_syncevo_dbus_server-PbapSyncSourceRegister.o: src/backends/pbap/PbapSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_dbus_server_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_dbus_server_CXXFLAGS) $(CXXFLAGS) -MT src/backends/pbap/src_syncevo_dbus_server-PbapSyncSourceRegister.o -MD -MP -MF src/backends/pbap/$(DEPDIR)/src_syncevo_dbus_server-PbapSyncSourceRegister.Tpo -c -o src/backends/pbap/src_syncevo_dbus_server-PbapSyncSourceRegister.o `test -f 'src/backends/pbap/PbapSyncSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/pbap/PbapSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/pbap/$(DEPDIR)/src_syncevo_dbus_server-PbapSyncSourceRegister.Tpo src/backends/pbap/$(DEPDIR)/src_syncevo_dbus_server-PbapSyncSourceRegister.Po
@@ -8896,20 +9058,6 @@ src/backends/activesync/src_syncevo_local_sync-ActiveSyncSourceRegister.obj: src
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_local_sync_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_local_sync_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/activesync/src_syncevo_local_sync-ActiveSyncSourceRegister.obj `if test -f 'src/backends/activesync/ActiveSyncSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/activesync/ActiveSyncSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/activesync/ActiveSyncSourceRegister.cpp'; fi`
 
-src/backends/addressbook/src_syncevo_local_sync-AddressBookSourceRegister.o: src/backends/addressbook/AddressBookSourceRegister.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_local_sync_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_local_sync_CXXFLAGS) $(CXXFLAGS) -MT src/backends/addressbook/src_syncevo_local_sync-AddressBookSourceRegister.o -MD -MP -MF src/backends/addressbook/$(DEPDIR)/src_syncevo_local_sync-AddressBookSourceRegister.Tpo -c -o src/backends/addressbook/src_syncevo_local_sync-AddressBookSourceRegister.o `test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/addressbook/AddressBookSourceRegister.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/addressbook/$(DEPDIR)/src_syncevo_local_sync-AddressBookSourceRegister.Tpo src/backends/addressbook/$(DEPDIR)/src_syncevo_local_sync-AddressBookSourceRegister.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/addressbook/AddressBookSourceRegister.cpp' object='src/backends/addressbook/src_syncevo_local_sync-AddressBookSourceRegister.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_local_sync_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_local_sync_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/addressbook/src_syncevo_local_sync-AddressBookSourceRegister.o `test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/addressbook/AddressBookSourceRegister.cpp
-
-src/backends/addressbook/src_syncevo_local_sync-AddressBookSourceRegister.obj: src/backends/addressbook/AddressBookSourceRegister.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_local_sync_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_local_sync_CXXFLAGS) $(CXXFLAGS) -MT src/backends/addressbook/src_syncevo_local_sync-AddressBookSourceRegister.obj -MD -MP -MF src/backends/addressbook/$(DEPDIR)/src_syncevo_local_sync-AddressBookSourceRegister.Tpo -c -o src/backends/addressbook/src_syncevo_local_sync-AddressBookSourceRegister.obj `if test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/addressbook/AddressBookSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/addressbook/AddressBookSourceRegister.cpp'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/addressbook/$(DEPDIR)/src_syncevo_local_sync-AddressBookSourceRegister.Tpo src/backends/addressbook/$(DEPDIR)/src_syncevo_local_sync-AddressBookSourceRegister.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/addressbook/AddressBookSourceRegister.cpp' object='src/backends/addressbook/src_syncevo_local_sync-AddressBookSourceRegister.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_local_sync_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_local_sync_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/addressbook/src_syncevo_local_sync-AddressBookSourceRegister.obj `if test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/addressbook/AddressBookSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/addressbook/AddressBookSourceRegister.cpp'; fi`
-
 src/backends/akonadi/src_syncevo_local_sync-AkonadiSyncSourceRegister.o: src/backends/akonadi/AkonadiSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_local_sync_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_local_sync_CXXFLAGS) $(CXXFLAGS) -MT src/backends/akonadi/src_syncevo_local_sync-AkonadiSyncSourceRegister.o -MD -MP -MF src/backends/akonadi/$(DEPDIR)/src_syncevo_local_sync-AkonadiSyncSourceRegister.Tpo -c -o src/backends/akonadi/src_syncevo_local_sync-AkonadiSyncSourceRegister.o `test -f 'src/backends/akonadi/AkonadiSyncSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/akonadi/AkonadiSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/akonadi/$(DEPDIR)/src_syncevo_local_sync-AkonadiSyncSourceRegister.Tpo src/backends/akonadi/$(DEPDIR)/src_syncevo_local_sync-AkonadiSyncSourceRegister.Po
@@ -9036,6 +9184,20 @@ src/backends/maemo/src_syncevo_local_sync-MaemoCalendarSourceRegister.obj: src/b
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_local_sync_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_local_sync_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/maemo/src_syncevo_local_sync-MaemoCalendarSourceRegister.obj `if test -f 'src/backends/maemo/MaemoCalendarSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/maemo/MaemoCalendarSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/maemo/MaemoCalendarSourceRegister.cpp'; fi`
 
+src/backends/oauth2/src_syncevo_local_sync-oauth2Register.o: src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_local_sync_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_local_sync_CXXFLAGS) $(CXXFLAGS) -MT src/backends/oauth2/src_syncevo_local_sync-oauth2Register.o -MD -MP -MF src/backends/oauth2/$(DEPDIR)/src_syncevo_local_sync-oauth2Register.Tpo -c -o src/backends/oauth2/src_syncevo_local_sync-oauth2Register.o `test -f 'src/backends/oauth2/oauth2Register.cpp' || echo '$(srcdir)/'`src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/oauth2/$(DEPDIR)/src_syncevo_local_sync-oauth2Register.Tpo src/backends/oauth2/$(DEPDIR)/src_syncevo_local_sync-oauth2Register.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/oauth2/oauth2Register.cpp' object='src/backends/oauth2/src_syncevo_local_sync-oauth2Register.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_local_sync_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_local_sync_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/oauth2/src_syncevo_local_sync-oauth2Register.o `test -f 'src/backends/oauth2/oauth2Register.cpp' || echo '$(srcdir)/'`src/backends/oauth2/oauth2Register.cpp
+
+src/backends/oauth2/src_syncevo_local_sync-oauth2Register.obj: src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_local_sync_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_local_sync_CXXFLAGS) $(CXXFLAGS) -MT src/backends/oauth2/src_syncevo_local_sync-oauth2Register.obj -MD -MP -MF src/backends/oauth2/$(DEPDIR)/src_syncevo_local_sync-oauth2Register.Tpo -c -o src/backends/oauth2/src_syncevo_local_sync-oauth2Register.obj `if test -f 'src/backends/oauth2/oauth2Register.cpp'; then $(CYGPATH_W) 'src/backends/oauth2/oauth2Register.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/oauth2/oauth2Register.cpp'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/oauth2/$(DEPDIR)/src_syncevo_local_sync-oauth2Register.Tpo src/backends/oauth2/$(DEPDIR)/src_syncevo_local_sync-oauth2Register.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/oauth2/oauth2Register.cpp' object='src/backends/oauth2/src_syncevo_local_sync-oauth2Register.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_local_sync_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_local_sync_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/oauth2/src_syncevo_local_sync-oauth2Register.obj `if test -f 'src/backends/oauth2/oauth2Register.cpp'; then $(CYGPATH_W) 'src/backends/oauth2/oauth2Register.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/oauth2/oauth2Register.cpp'; fi`
+
 src/backends/pbap/src_syncevo_local_sync-PbapSyncSourceRegister.o: src/backends/pbap/PbapSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevo_local_sync_CPPFLAGS) $(CPPFLAGS) $(src_syncevo_local_sync_CXXFLAGS) $(CXXFLAGS) -MT src/backends/pbap/src_syncevo_local_sync-PbapSyncSourceRegister.o -MD -MP -MF src/backends/pbap/$(DEPDIR)/src_syncevo_local_sync-PbapSyncSourceRegister.Tpo -c -o src/backends/pbap/src_syncevo_local_sync-PbapSyncSourceRegister.o `test -f 'src/backends/pbap/PbapSyncSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/pbap/PbapSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/pbap/$(DEPDIR)/src_syncevo_local_sync-PbapSyncSourceRegister.Tpo src/backends/pbap/$(DEPDIR)/src_syncevo_local_sync-PbapSyncSourceRegister.Po
@@ -9162,20 +9324,6 @@ src/backends/activesync/src_syncevolution-ActiveSyncSourceRegister.obj: src/back
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevolution_CPPFLAGS) $(CPPFLAGS) $(src_syncevolution_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/activesync/src_syncevolution-ActiveSyncSourceRegister.obj `if test -f 'src/backends/activesync/ActiveSyncSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/activesync/ActiveSyncSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/activesync/ActiveSyncSourceRegister.cpp'; fi`
 
-src/backends/addressbook/src_syncevolution-AddressBookSourceRegister.o: src/backends/addressbook/AddressBookSourceRegister.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevolution_CPPFLAGS) $(CPPFLAGS) $(src_syncevolution_CXXFLAGS) $(CXXFLAGS) -MT src/backends/addressbook/src_syncevolution-AddressBookSourceRegister.o -MD -MP -MF src/backends/addressbook/$(DEPDIR)/src_syncevolution-AddressBookSourceRegister.Tpo -c -o src/backends/addressbook/src_syncevolution-AddressBookSourceRegister.o `test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/addressbook/AddressBookSourceRegister.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/addressbook/$(DEPDIR)/src_syncevolution-AddressBookSourceRegister.Tpo src/backends/addressbook/$(DEPDIR)/src_syncevolution-AddressBookSourceRegister.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/addressbook/AddressBookSourceRegister.cpp' object='src/backends/addressbook/src_syncevolution-AddressBookSourceRegister.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevolution_CPPFLAGS) $(CPPFLAGS) $(src_syncevolution_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/addressbook/src_syncevolution-AddressBookSourceRegister.o `test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/addressbook/AddressBookSourceRegister.cpp
-
-src/backends/addressbook/src_syncevolution-AddressBookSourceRegister.obj: src/backends/addressbook/AddressBookSourceRegister.cpp
-@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevolution_CPPFLAGS) $(CPPFLAGS) $(src_syncevolution_CXXFLAGS) $(CXXFLAGS) -MT src/backends/addressbook/src_syncevolution-AddressBookSourceRegister.obj -MD -MP -MF src/backends/addressbook/$(DEPDIR)/src_syncevolution-AddressBookSourceRegister.Tpo -c -o src/backends/addressbook/src_syncevolution-AddressBookSourceRegister.obj `if test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/addressbook/AddressBookSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/addressbook/AddressBookSourceRegister.cpp'; fi`
-@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/addressbook/$(DEPDIR)/src_syncevolution-AddressBookSourceRegister.Tpo src/backends/addressbook/$(DEPDIR)/src_syncevolution-AddressBookSourceRegister.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/addressbook/AddressBookSourceRegister.cpp' object='src/backends/addressbook/src_syncevolution-AddressBookSourceRegister.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevolution_CPPFLAGS) $(CPPFLAGS) $(src_syncevolution_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/addressbook/src_syncevolution-AddressBookSourceRegister.obj `if test -f 'src/backends/addressbook/AddressBookSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/addressbook/AddressBookSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/addressbook/AddressBookSourceRegister.cpp'; fi`
-
 src/backends/akonadi/src_syncevolution-AkonadiSyncSourceRegister.o: src/backends/akonadi/AkonadiSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevolution_CPPFLAGS) $(CPPFLAGS) $(src_syncevolution_CXXFLAGS) $(CXXFLAGS) -MT src/backends/akonadi/src_syncevolution-AkonadiSyncSourceRegister.o -MD -MP -MF src/backends/akonadi/$(DEPDIR)/src_syncevolution-AkonadiSyncSourceRegister.Tpo -c -o src/backends/akonadi/src_syncevolution-AkonadiSyncSourceRegister.o `test -f 'src/backends/akonadi/AkonadiSyncSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/akonadi/AkonadiSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/akonadi/$(DEPDIR)/src_syncevolution-AkonadiSyncSourceRegister.Tpo src/backends/akonadi/$(DEPDIR)/src_syncevolution-AkonadiSyncSourceRegister.Po
@@ -9302,6 +9450,20 @@ src/backends/maemo/src_syncevolution-MaemoCalendarSourceRegister.obj: src/backen
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevolution_CPPFLAGS) $(CPPFLAGS) $(src_syncevolution_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/maemo/src_syncevolution-MaemoCalendarSourceRegister.obj `if test -f 'src/backends/maemo/MaemoCalendarSourceRegister.cpp'; then $(CYGPATH_W) 'src/backends/maemo/MaemoCalendarSourceRegister.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/maemo/MaemoCalendarSourceRegister.cpp'; fi`
 
+src/backends/oauth2/src_syncevolution-oauth2Register.o: src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevolution_CPPFLAGS) $(CPPFLAGS) $(src_syncevolution_CXXFLAGS) $(CXXFLAGS) -MT src/backends/oauth2/src_syncevolution-oauth2Register.o -MD -MP -MF src/backends/oauth2/$(DEPDIR)/src_syncevolution-oauth2Register.Tpo -c -o src/backends/oauth2/src_syncevolution-oauth2Register.o `test -f 'src/backends/oauth2/oauth2Register.cpp' || echo '$(srcdir)/'`src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/oauth2/$(DEPDIR)/src_syncevolution-oauth2Register.Tpo src/backends/oauth2/$(DEPDIR)/src_syncevolution-oauth2Register.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/oauth2/oauth2Register.cpp' object='src/backends/oauth2/src_syncevolution-oauth2Register.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevolution_CPPFLAGS) $(CPPFLAGS) $(src_syncevolution_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/oauth2/src_syncevolution-oauth2Register.o `test -f 'src/backends/oauth2/oauth2Register.cpp' || echo '$(srcdir)/'`src/backends/oauth2/oauth2Register.cpp
+
+src/backends/oauth2/src_syncevolution-oauth2Register.obj: src/backends/oauth2/oauth2Register.cpp
+@am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevolution_CPPFLAGS) $(CPPFLAGS) $(src_syncevolution_CXXFLAGS) $(CXXFLAGS) -MT src/backends/oauth2/src_syncevolution-oauth2Register.obj -MD -MP -MF src/backends/oauth2/$(DEPDIR)/src_syncevolution-oauth2Register.Tpo -c -o src/backends/oauth2/src_syncevolution-oauth2Register.obj `if test -f 'src/backends/oauth2/oauth2Register.cpp'; then $(CYGPATH_W) 'src/backends/oauth2/oauth2Register.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/oauth2/oauth2Register.cpp'; fi`
+@am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/oauth2/$(DEPDIR)/src_syncevolution-oauth2Register.Tpo src/backends/oauth2/$(DEPDIR)/src_syncevolution-oauth2Register.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='src/backends/oauth2/oauth2Register.cpp' object='src/backends/oauth2/src_syncevolution-oauth2Register.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevolution_CPPFLAGS) $(CPPFLAGS) $(src_syncevolution_CXXFLAGS) $(CXXFLAGS) -c -o src/backends/oauth2/src_syncevolution-oauth2Register.obj `if test -f 'src/backends/oauth2/oauth2Register.cpp'; then $(CYGPATH_W) 'src/backends/oauth2/oauth2Register.cpp'; else $(CYGPATH_W) '$(srcdir)/src/backends/oauth2/oauth2Register.cpp'; fi`
+
 src/backends/pbap/src_syncevolution-PbapSyncSourceRegister.o: src/backends/pbap/PbapSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_syncevolution_CPPFLAGS) $(CPPFLAGS) $(src_syncevolution_CXXFLAGS) $(CXXFLAGS) -MT src/backends/pbap/src_syncevolution-PbapSyncSourceRegister.o -MD -MP -MF src/backends/pbap/$(DEPDIR)/src_syncevolution-PbapSyncSourceRegister.Tpo -c -o src/backends/pbap/src_syncevolution-PbapSyncSourceRegister.o `test -f 'src/backends/pbap/PbapSyncSourceRegister.cpp' || echo '$(srcdir)/'`src/backends/pbap/PbapSyncSourceRegister.cpp
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) src/backends/pbap/$(DEPDIR)/src_syncevolution-PbapSyncSourceRegister.Tpo src/backends/pbap/$(DEPDIR)/src_syncevolution-PbapSyncSourceRegister.Po
@@ -9435,7 +9597,6 @@ clean-libtool:
        -rm -rf .libs _libs
        -rm -rf src/.libs src/_libs
        -rm -rf src/backends/activesync/.libs src/backends/activesync/_libs
-       -rm -rf src/backends/addressbook/.libs src/backends/addressbook/_libs
        -rm -rf src/backends/akonadi/.libs src/backends/akonadi/_libs
        -rm -rf src/backends/evolution/.libs src/backends/evolution/_libs
        -rm -rf src/backends/file/.libs src/backends/file/_libs
@@ -9444,6 +9605,7 @@ clean-libtool:
        -rm -rf src/backends/kcalextended/.libs src/backends/kcalextended/_libs
        -rm -rf src/backends/kde/.libs src/backends/kde/_libs
        -rm -rf src/backends/maemo/.libs src/backends/maemo/_libs
+       -rm -rf src/backends/oauth2/.libs src/backends/oauth2/_libs
        -rm -rf src/backends/pbap/.libs src/backends/pbap/_libs
        -rm -rf src/backends/qtcontacts/.libs src/backends/qtcontacts/_libs
        -rm -rf src/backends/signon/.libs src/backends/signon/_libs
@@ -10921,7 +11083,7 @@ install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(src_backends_activesync_backenddir)" "$(DESTDIR)$(src_backends_addressbook_backenddir)" "$(DESTDIR)$(src_backends_akonadi_backenddir)" "$(DESTDIR)$(src_backends_evolution_backenddir)" "$(DESTDIR)$(src_backends_file_backenddir)" "$(DESTDIR)$(src_backends_gnome_backenddir)" "$(DESTDIR)$(src_backends_goa_backenddir)" "$(DESTDIR)$(src_backends_kcalextended_backenddir)" "$(DESTDIR)$(src_backends_kde_backenddir)" "$(DESTDIR)$(src_backends_maemo_backenddir)" "$(DESTDIR)$(src_backends_pbap_backenddir)" "$(DESTDIR)$(src_backends_qtcontacts_backenddir)" "$(DESTDIR)$(src_backends_signon_backenddir)" "$(DESTDIR)$(src_backends_sqlite_backenddir)" "$(DESTDIR)$(src_backends_webdav_backenddir)" "$(DESTDIR)$(src_backends_xmlrpc_backenddir)" "$(DESTDIR)$(src_gnome_bluetoothdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(testdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(src_syncevo_configs_xmldir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(testdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(accounts_service_typesdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(src_gtk3_ui_icondir)" "$(DESTDIR)$(src_gtk3_ui_themercdir)" "$(DESTDIR)$(src_gtk_ui_icondir)" "$(DESTDIR)$(src_gtk_ui_themercdir)" "$(DESTDIR)$(src_syncevo_configsdir)" "$(DESTDIR)$(src_syncevo_configs_datatypesdir)" "$(DESTDIR)$(src_syncevo_configs_datatypes_serverdir)" "$(DESTDIR)$(src_syncevo_configs_debugdir)" "$(DESTDIR)$(src_syncevo_configs_remoterulesdir)" "$(DESTDIR)$(src_syncevo_configs_remoterules_clientdir)" "$(DESTDIR)$(src_syncevo_configs_remoterules_serverdir)" "$(DESTDIR)$(src_syncevo_configs_scriptingdir)" "$(DESTDIR)$(src_syncevo_configs_scripting_clientdir)" "$(DESTDIR)$(src_syncevo_configs_scripting_serverdir)" "$(DESTDIR)$(src_templatesdir)" "$(DESTDIR)$(src_templates_clientsdir)" "$(DESTDIR)$(src_templates_clients_phonedir)" "$(DESTDIR)$(src_templates_contextsdir)" "$(DESTDIR)$(src_templates_serversdir)" "$(DESTDIR)$(src_testcasesdir)" "$(DESTDIR)$(src_testcases_lcsdir)" "$(DESTDIR)$(src_testcases_templates_clientsdir)" "$(DESTDIR)$(src_testcases_templates_clients_phone_nokia_s40dir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(testdir)" "$(DESTDIR)$(testparentdir)" "$(DESTDIR)$(accounts_providersdir)" "$(DESTDIR)$(accounts_servicesdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(src_dbus_server_autostartdir)" "$(DESTDIR)$(src_dbus_server_servicedir)" "$(DESTDIR)$(src_dbus_server_testdbus_broken_configdir)" "$(DESTDIR)$(src_dbus_server_testdbus_db_activedir)" "$(DESTDIR)$(src_dbus_server_testdbus_first_last_sortdir)" "$(DESTDIR)$(src_dbus_server_testdbus_simple_sortdir)" "$(DESTDIR)$(src_gtk3_ui_applicationsdir)" "$(DESTDIR)$(src_gtk3_ui_gladedir)" "$(DESTDIR)$(src_gtk_ui_applicationsdir)" "$(DESTDIR)$(src_gtk_ui_gladedir)" "$(DESTDIR)$(testdir)" "$(DESTDIR)$(src_dbus_qt_libsyncevolution_qt_dbus_includedir)" "$(DESTDIR)$(src_dbus_glib_libsyncevo_dbus_includedir)" "$(DESTDIR)$(src_syncevo_libsyncevolution_includedir)"; do \
+       for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(src_backends_activesync_backenddir)" "$(DESTDIR)$(src_backends_akonadi_backenddir)" "$(DESTDIR)$(src_backends_evolution_backenddir)" "$(DESTDIR)$(src_backends_file_backenddir)" "$(DESTDIR)$(src_backends_gnome_backenddir)" "$(DESTDIR)$(src_backends_goa_backenddir)" "$(DESTDIR)$(src_backends_kcalextended_backenddir)" "$(DESTDIR)$(src_backends_kde_backenddir)" "$(DESTDIR)$(src_backends_maemo_backenddir)" "$(DESTDIR)$(src_backends_oauth2_backenddir)" "$(DESTDIR)$(src_backends_pbap_backenddir)" "$(DESTDIR)$(src_backends_qtcontacts_backenddir)" "$(DESTDIR)$(src_backends_signon_backenddir)" "$(DESTDIR)$(src_backends_sqlite_backenddir)" "$(DESTDIR)$(src_backends_webdav_backenddir)" "$(DESTDIR)$(src_backends_xmlrpc_backenddir)" "$(DESTDIR)$(src_gnome_bluetoothdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(testdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(src_syncevo_configs_xmldir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(testdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(accounts_service_typesdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(src_gtk3_ui_icondir)" "$(DESTDIR)$(src_gtk3_ui_themercdir)" "$(DESTDIR)$(src_gtk_ui_icondir)" "$(DESTDIR)$(src_gtk_ui_themercdir)" "$(DESTDIR)$(src_syncevo_configsdir)" "$(DESTDIR)$(src_syncevo_configs_datatypesdir)" "$(DESTDIR)$(src_syncevo_configs_datatypes_serverdir)" "$(DESTDIR)$(src_syncevo_configs_debugdir)" "$(DESTDIR)$(src_syncevo_configs_remoterulesdir)" "$(DESTDIR)$(src_syncevo_configs_remoterules_clientdir)" "$(DESTDIR)$(src_syncevo_configs_remoterules_serverdir)" "$(DESTDIR)$(src_syncevo_configs_scriptingdir)" "$(DESTDIR)$(src_syncevo_configs_scripting_clientdir)" "$(DESTDIR)$(src_syncevo_configs_scripting_serverdir)" "$(DESTDIR)$(src_templatesdir)" "$(DESTDIR)$(src_templates_clientsdir)" "$(DESTDIR)$(src_templates_clients_phonedir)" "$(DESTDIR)$(src_templates_contextsdir)" "$(DESTDIR)$(src_templates_serversdir)" "$(DESTDIR)$(src_testcasesdir)" "$(DESTDIR)$(src_testcases_lcsdir)" "$(DESTDIR)$(src_testcases_templates_clientsdir)" "$(DESTDIR)$(src_testcases_templates_clients_phone_nokia_s40dir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(testdir)" "$(DESTDIR)$(testparentdir)" "$(DESTDIR)$(accounts_providersdir)" "$(DESTDIR)$(accounts_servicesdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(src_dbus_server_autostartdir)" "$(DESTDIR)$(src_dbus_server_servicedir)" "$(DESTDIR)$(src_dbus_server_testdbus_broken_configdir)" "$(DESTDIR)$(src_dbus_server_testdbus_db_activedir)" "$(DESTDIR)$(src_dbus_server_testdbus_first_last_sortdir)" "$(DESTDIR)$(src_dbus_server_testdbus_simple_sortdir)" "$(DESTDIR)$(src_gtk3_ui_applicationsdir)" "$(DESTDIR)$(src_gtk3_ui_gladedir)" "$(DESTDIR)$(src_gtk_ui_applicationsdir)" "$(DESTDIR)$(src_gtk_ui_gladedir)" "$(DESTDIR)$(testdir)" "$(DESTDIR)$(src_dbus_qt_libsyncevolution_qt_dbus_includedir)" "$(DESTDIR)$(src_dbus_glib_libsyncevo_dbus_includedir)" "$(DESTDIR)$(src_syncevo_libsyncevolution_includedir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: $(BUILT_SOURCES)
@@ -10954,8 +11116,6 @@ distclean-generic:
        -rm -f src/$(am__dirstamp)
        -rm -f src/backends/activesync/$(DEPDIR)/$(am__dirstamp)
        -rm -f src/backends/activesync/$(am__dirstamp)
-       -rm -f src/backends/addressbook/$(DEPDIR)/$(am__dirstamp)
-       -rm -f src/backends/addressbook/$(am__dirstamp)
        -rm -f src/backends/akonadi/$(DEPDIR)/$(am__dirstamp)
        -rm -f src/backends/akonadi/$(am__dirstamp)
        -rm -f src/backends/evolution/$(DEPDIR)/$(am__dirstamp)
@@ -10972,6 +11132,8 @@ distclean-generic:
        -rm -f src/backends/kde/$(am__dirstamp)
        -rm -f src/backends/maemo/$(DEPDIR)/$(am__dirstamp)
        -rm -f src/backends/maemo/$(am__dirstamp)
+       -rm -f src/backends/oauth2/$(DEPDIR)/$(am__dirstamp)
+       -rm -f src/backends/oauth2/$(am__dirstamp)
        -rm -f src/backends/pbap/$(DEPDIR)/$(am__dirstamp)
        -rm -f src/backends/pbap/$(am__dirstamp)
        -rm -f src/backends/qtcontacts/$(DEPDIR)/$(am__dirstamp)
@@ -10998,8 +11160,6 @@ distclean-generic:
        -rm -f src/gdbus/test/$(am__dirstamp)
        -rm -f src/gdbusxx/$(DEPDIR)/$(am__dirstamp)
        -rm -f src/gdbusxx/$(am__dirstamp)
-       -rm -f src/gdbusxx/test/$(DEPDIR)/$(am__dirstamp)
-       -rm -f src/gdbusxx/test/$(am__dirstamp)
        -rm -f src/gnome-bluetooth/$(DEPDIR)/$(am__dirstamp)
        -rm -f src/gnome-bluetooth/$(am__dirstamp)
        -rm -f src/gtk-ui/$(DEPDIR)/$(am__dirstamp)
@@ -11023,7 +11183,6 @@ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
        clean-libexecPROGRAMS clean-libtool clean-local \
        clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
        clean-src_backends_activesync_backendLTLIBRARIES \
-       clean-src_backends_addressbook_backendLTLIBRARIES \
        clean-src_backends_akonadi_backendLTLIBRARIES \
        clean-src_backends_evolution_backendLTLIBRARIES \
        clean-src_backends_file_backendLTLIBRARIES \
@@ -11032,6 +11191,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
        clean-src_backends_kcalextended_backendLTLIBRARIES \
        clean-src_backends_kde_backendLTLIBRARIES \
        clean-src_backends_maemo_backendLTLIBRARIES \
+       clean-src_backends_oauth2_backendLTLIBRARIES \
        clean-src_backends_pbap_backendLTLIBRARIES \
        clean-src_backends_qtcontacts_backendLTLIBRARIES \
        clean-src_backends_signon_backendLTLIBRARIES \
@@ -11043,7 +11203,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
 
 distclean: distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-       -rm -rf src/$(DEPDIR) src/backends/activesync/$(DEPDIR) src/backends/addressbook/$(DEPDIR) src/backends/akonadi/$(DEPDIR) src/backends/evolution/$(DEPDIR) src/backends/file/$(DEPDIR) src/backends/gnome/$(DEPDIR) src/backends/goa/$(DEPDIR) src/backends/kcalextended/$(DEPDIR) src/backends/kde/$(DEPDIR) src/backends/maemo/$(DEPDIR) src/backends/pbap/$(DEPDIR) src/backends/qtcontacts/$(DEPDIR) src/backends/signon/$(DEPDIR) src/backends/sqlite/$(DEPDIR) src/backends/webdav/$(DEPDIR) src/backends/xmlrpc/$(DEPDIR) src/dbus/glib/$(DEPDIR) src/dbus/qt/$(DEPDIR) src/dbus/server/$(DEPDIR) src/dbus/server/pim/$(DEPDIR) src/gdbus/$(DEPDIR) src/gdbus/test/$(DEPDIR) src/gdbusxx/$(DEPDIR) src/gdbusxx/test/$(DEPDIR) src/gnome-bluetooth/$(DEPDIR) src/gtk-ui/$(DEPDIR) src/gtk3-ui/$(DEPDIR) src/syncevo/$(DEPDIR) test/$(DEPDIR)
+       -rm -rf src/$(DEPDIR) src/backends/activesync/$(DEPDIR) src/backends/akonadi/$(DEPDIR) src/backends/evolution/$(DEPDIR) src/backends/file/$(DEPDIR) src/backends/gnome/$(DEPDIR) src/backends/goa/$(DEPDIR) src/backends/kcalextended/$(DEPDIR) src/backends/kde/$(DEPDIR) src/backends/maemo/$(DEPDIR) src/backends/oauth2/$(DEPDIR) src/backends/pbap/$(DEPDIR) src/backends/qtcontacts/$(DEPDIR) src/backends/signon/$(DEPDIR) src/backends/sqlite/$(DEPDIR) src/backends/webdav/$(DEPDIR) src/backends/xmlrpc/$(DEPDIR) src/dbus/glib/$(DEPDIR) src/dbus/qt/$(DEPDIR) src/dbus/server/$(DEPDIR) src/dbus/server/pim/$(DEPDIR) src/gdbus/$(DEPDIR) src/gdbus/test/$(DEPDIR) src/gdbusxx/$(DEPDIR) src/gnome-bluetooth/$(DEPDIR) src/gtk-ui/$(DEPDIR) src/gtk3-ui/$(DEPDIR) src/syncevo/$(DEPDIR) test/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-hdr distclean-libtool distclean-local distclean-tags
@@ -11093,7 +11253,6 @@ install-data-am: install-dist_accounts_service_typesDATA \
        install-nodist_src_dbus_qt_libsyncevolution_qt_dbus_includeHEADERS \
        install-pkgconfigDATA \
        install-src_backends_activesync_backendLTLIBRARIES \
-       install-src_backends_addressbook_backendLTLIBRARIES \
        install-src_backends_akonadi_backendLTLIBRARIES \
        install-src_backends_evolution_backendLTLIBRARIES \
        install-src_backends_file_backendLTLIBRARIES \
@@ -11102,6 +11261,7 @@ install-data-am: install-dist_accounts_service_typesDATA \
        install-src_backends_kcalextended_backendLTLIBRARIES \
        install-src_backends_kde_backendLTLIBRARIES \
        install-src_backends_maemo_backendLTLIBRARIES \
+       install-src_backends_oauth2_backendLTLIBRARIES \
        install-src_backends_pbap_backendLTLIBRARIES \
        install-src_backends_qtcontacts_backendLTLIBRARIES \
        install-src_backends_signon_backendLTLIBRARIES \
@@ -11155,7 +11315,7 @@ installcheck-am: installcheck-local
 maintainer-clean: maintainer-clean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf $(top_srcdir)/autom4te.cache
-       -rm -rf src/$(DEPDIR) src/backends/activesync/$(DEPDIR) src/backends/addressbook/$(DEPDIR) src/backends/akonadi/$(DEPDIR) src/backends/evolution/$(DEPDIR) src/backends/file/$(DEPDIR) src/backends/gnome/$(DEPDIR) src/backends/goa/$(DEPDIR) src/backends/kcalextended/$(DEPDIR) src/backends/kde/$(DEPDIR) src/backends/maemo/$(DEPDIR) src/backends/pbap/$(DEPDIR) src/backends/qtcontacts/$(DEPDIR) src/backends/signon/$(DEPDIR) src/backends/sqlite/$(DEPDIR) src/backends/webdav/$(DEPDIR) src/backends/xmlrpc/$(DEPDIR) src/dbus/glib/$(DEPDIR) src/dbus/qt/$(DEPDIR) src/dbus/server/$(DEPDIR) src/dbus/server/pim/$(DEPDIR) src/gdbus/$(DEPDIR) src/gdbus/test/$(DEPDIR) src/gdbusxx/$(DEPDIR) src/gdbusxx/test/$(DEPDIR) src/gnome-bluetooth/$(DEPDIR) src/gtk-ui/$(DEPDIR) src/gtk3-ui/$(DEPDIR) src/syncevo/$(DEPDIR) test/$(DEPDIR)
+       -rm -rf src/$(DEPDIR) src/backends/activesync/$(DEPDIR) src/backends/akonadi/$(DEPDIR) src/backends/evolution/$(DEPDIR) src/backends/file/$(DEPDIR) src/backends/gnome/$(DEPDIR) src/backends/goa/$(DEPDIR) src/backends/kcalextended/$(DEPDIR) src/backends/kde/$(DEPDIR) src/backends/maemo/$(DEPDIR) src/backends/oauth2/$(DEPDIR) src/backends/pbap/$(DEPDIR) src/backends/qtcontacts/$(DEPDIR) src/backends/signon/$(DEPDIR) src/backends/sqlite/$(DEPDIR) src/backends/webdav/$(DEPDIR) src/backends/xmlrpc/$(DEPDIR) src/dbus/glib/$(DEPDIR) src/dbus/qt/$(DEPDIR) src/dbus/server/$(DEPDIR) src/dbus/server/pim/$(DEPDIR) src/gdbus/$(DEPDIR) src/gdbus/test/$(DEPDIR) src/gdbusxx/$(DEPDIR) src/gnome-bluetooth/$(DEPDIR) src/gtk-ui/$(DEPDIR) src/gtk3-ui/$(DEPDIR) src/syncevo/$(DEPDIR) test/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -11209,7 +11369,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
        uninstall-nodist_src_dbus_qt_libsyncevolution_qt_dbus_includeHEADERS \
        uninstall-pkgconfigDATA \
        uninstall-src_backends_activesync_backendLTLIBRARIES \
-       uninstall-src_backends_addressbook_backendLTLIBRARIES \
        uninstall-src_backends_akonadi_backendLTLIBRARIES \
        uninstall-src_backends_evolution_backendLTLIBRARIES \
        uninstall-src_backends_file_backendLTLIBRARIES \
@@ -11218,6 +11377,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
        uninstall-src_backends_kcalextended_backendLTLIBRARIES \
        uninstall-src_backends_kde_backendLTLIBRARIES \
        uninstall-src_backends_maemo_backendLTLIBRARIES \
+       uninstall-src_backends_oauth2_backendLTLIBRARIES \
        uninstall-src_backends_pbap_backendLTLIBRARIES \
        uninstall-src_backends_qtcontacts_backendLTLIBRARIES \
        uninstall-src_backends_signon_backendLTLIBRARIES \
@@ -11253,7 +11413,6 @@ uninstall-man: uninstall-man1
        clean-libexecPROGRAMS clean-libtool clean-local \
        clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
        clean-src_backends_activesync_backendLTLIBRARIES \
-       clean-src_backends_addressbook_backendLTLIBRARIES \
        clean-src_backends_akonadi_backendLTLIBRARIES \
        clean-src_backends_evolution_backendLTLIBRARIES \
        clean-src_backends_file_backendLTLIBRARIES \
@@ -11262,6 +11421,7 @@ uninstall-man: uninstall-man1
        clean-src_backends_kcalextended_backendLTLIBRARIES \
        clean-src_backends_kde_backendLTLIBRARIES \
        clean-src_backends_maemo_backendLTLIBRARIES \
+       clean-src_backends_oauth2_backendLTLIBRARIES \
        clean-src_backends_pbap_backendLTLIBRARIES \
        clean-src_backends_qtcontacts_backendLTLIBRARIES \
        clean-src_backends_signon_backendLTLIBRARIES \
@@ -11313,7 +11473,6 @@ uninstall-man: uninstall-man1
        install-pdf install-pdf-am install-pkgconfigDATA install-ps \
        install-ps-am \
        install-src_backends_activesync_backendLTLIBRARIES \
-       install-src_backends_addressbook_backendLTLIBRARIES \
        install-src_backends_akonadi_backendLTLIBRARIES \
        install-src_backends_evolution_backendLTLIBRARIES \
        install-src_backends_file_backendLTLIBRARIES \
@@ -11322,6 +11481,7 @@ uninstall-man: uninstall-man1
        install-src_backends_kcalextended_backendLTLIBRARIES \
        install-src_backends_kde_backendLTLIBRARIES \
        install-src_backends_maemo_backendLTLIBRARIES \
+       install-src_backends_oauth2_backendLTLIBRARIES \
        install-src_backends_pbap_backendLTLIBRARIES \
        install-src_backends_qtcontacts_backendLTLIBRARIES \
        install-src_backends_signon_backendLTLIBRARIES \
@@ -11384,7 +11544,6 @@ uninstall-man: uninstall-man1
        uninstall-nodist_src_dbus_qt_libsyncevolution_qt_dbus_includeHEADERS \
        uninstall-pkgconfigDATA \
        uninstall-src_backends_activesync_backendLTLIBRARIES \
-       uninstall-src_backends_addressbook_backendLTLIBRARIES \
        uninstall-src_backends_akonadi_backendLTLIBRARIES \
        uninstall-src_backends_evolution_backendLTLIBRARIES \
        uninstall-src_backends_file_backendLTLIBRARIES \
@@ -11393,6 +11552,7 @@ uninstall-man: uninstall-man1
        uninstall-src_backends_kcalextended_backendLTLIBRARIES \
        uninstall-src_backends_kde_backendLTLIBRARIES \
        uninstall-src_backends_maemo_backendLTLIBRARIES \
+       uninstall-src_backends_oauth2_backendLTLIBRARIES \
        uninstall-src_backends_pbap_backendLTLIBRARIES \
        uninstall-src_backends_qtcontacts_backendLTLIBRARIES \
        uninstall-src_backends_signon_backendLTLIBRARIES \
@@ -11551,9 +11711,8 @@ uninstall-man: uninstall-man1
 #      perl -e '$$_ = join("", <>); s/^(ADR|TEL|EMAIL|PHOTO).*?(?=^\S)//msg; s/;X-EVOLUTION-UI-SLOT=\d+//g; print;' $< >$@
 # all: ../../testcases/sqlite_vcard21.vcf
 
-@COND_CORE_TRUE@src/backends/webdav/syncevo-webdav-lookup: $(srcdir)/src/backends/webdav/syncevo-webdav-lookup.sh
-@COND_CORE_TRUE@       $(AM_V_GEN)rm -f $@ ; \
-@COND_CORE_TRUE@       cd src/backends/webdav && ln -s $(notdir $<) $(notdir $@)
+@COND_CORE_TRUE@src/syncevo-webdav-lookup: $(top_srcdir)/src/backends/webdav/syncevo-webdav-lookup.sh
+@COND_CORE_TRUE@       $(AM_V_GEN) rm -f $@ && cp $< $@ && chmod a+rx $@
 
 @COND_CORE_TRUE@webdav_so_check:
 @COND_CORE_TRUE@       for i in $(WEBDAV_SO_CHECK_FILES); do \
@@ -11803,11 +11962,14 @@ src/test: src/client-test
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  ln -f -s $(bindir)/synccompare $(DESTDIR)/$(testdir)
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  ln -f -s $(libexecdir)/syncevo-dbus-server $(DESTDIR)/$(testdir)
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  ln -f -s $(bindir)/synclog2html $(DESTDIR)/$(testdir)
+@COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  ln -f -s $(bindir)/syncevo-webdav-lookup $(DESTDIR)/$(testdir)
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  cp config.h $(top_srcdir)/src/syncevo/SyncConfig.h src/ClientTest.cpp.html $(DESTDIR)/$(testdir) # needed by test-dbus.py
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@uninstall-test-files:
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@  rm -f $(DESTDIR)/$(testdir)/syncevolution \
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@          $(DESTDIR)/$(testdir)/synccompare \
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@          $(DESTDIR)/$(testdir)/syncevo-dbus-server \
+@COND_CORE_TRUE@@ENABLE_TESTING_TRUE@          $(DESTDIR)/$(testdir)/synclog2html \
+@COND_CORE_TRUE@@ENABLE_TESTING_TRUE@          $(DESTDIR)/$(testdir)/syncevo-webdav-lookup \
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@          $(DESTDIR)/$(testdir)/SyncConfig.h \
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@          $(DESTDIR)/$(testdir)/ClientTests.cpp.html \
 @COND_CORE_TRUE@@ENABLE_TESTING_TRUE@          $(DESTDIR)/$(testdir)/config.h \
@@ -11961,7 +12123,7 @@ dot_dist_hook:
          echo 'A git checkout is required to generate a ChangeLog.' >&2; \
        fi
 @ENABLE_EVOLUTION_COMPATIBILITY_TRUE@toplevel_so_check:
-@ENABLE_EVOLUTION_COMPATIBILITY_TRUE@  for i in `find $(DESTDIR)/$(libdir)/syncevolution $(DESTDIR)/$(libdir)/libsyncevo* $(DESTDIR)/$(libdir)/libsynthesis* -name *.so | grep -v -2.so` $(DESTDIR)/$(bindir)/syncevolution; \
+@ENABLE_EVOLUTION_COMPATIBILITY_TRUE@  for i in `find $(DESTDIR)/$(libdir)/syncevolution $(DESTDIR)/$(libdir)/libsyncevo* $(DESTDIR)/$(libdir)/libsynthesis* -name *.so | grep -v -e -[0-9].so` $(DESTDIR)/$(bindir)/syncevolution; \
 @ENABLE_EVOLUTION_COMPATIBILITY_TRUE@  do \
 @ENABLE_EVOLUTION_COMPATIBILITY_TRUE@    if objdump -T -C $$i | grep -v :: | grep '\*UND\*' | sort | grep -v -w ical_strdup | grep -e ical -e " e_"; then \
 @ENABLE_EVOLUTION_COMPATIBILITY_TRUE@      echo "$$i should not depend on EDS, libical or libbluetooth"; \
@@ -12001,7 +12163,7 @@ README.patched.rst: README.rst src/syncevolution
                        -e 's/^:Version: .*/:Version: $(VERSION)/;' \
                        -e 's/:Date: .*/":Date: " . `date +%Y-%m-%d`/e;' \
                        -e 'if (s;(<< see "syncevolution --sync-property ." >>\n);run("src/syncevolution --daemon=no --sync-property ?") || $$1;e) { $$syncfound=1; }' \
-                       -e 'if (s;(<< see "syncevolution --source-property ." >>\n);run("src/syncevolution --daemon=no --source-property ?") || $$1;e) { $$sourcefound=1; }' \
+                       -e 'if (s;(<< see "syncevolution --datastore-property ." >>\n);run("src/syncevolution --daemon=no --source-property ?") || $$1;e) { $$sourcefound=1; }' \
                        -e 'print;' \
                        -e '}' \
                        -e 'die "<<sync-property>> tag not in README.rst?!" unless $$syncfound;' \