autotools: avoid -lrt in make dependencies

The backends had SYNCEVOLUTION_LIBS in their _DEPENDENCIES entries,
which is wrong because SYNCEVOLUTION_LIBS must include -lrt (which
can't be a dependency).

Fixed by depending on libsyncevolution.la directly.

15 files changed, 16 insertions, 15 deletions

diff --git a/configure.ac b/configure.ac
index 3f92e3e9..54b9e893 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1067,6 +1067,7 @@ fi
 # When adding something here, remember to also update syncevolution.pc.in.
 # -lrt is for clock_gettime() in the Timespec.h inline functions.
 SYNCEVOLUTION_CFLAGS=-I`cd $srcdir && pwd`/src
+# Linker flags including libsyncevolution.la and some libs.
 SYNCEVOLUTION_LIBS="src/syncevo/libsyncevolution.la -lrt"
 AC_SUBST(SYNCEVOLUTION_CFLAGS)
 AC_SUBST(SYNCEVOLUTION_LIBS)
diff --git a/src/backends/activesync/activesync.am b/src/backends/activesync/activesync.am
index a554bebc..b353775b 100644
--- a/src/backends/activesync/activesync.am
+++ b/src/backends/activesync/activesync.am
@@ -22,7 +22,7 @@ src_backends_activesync_syncactivesync_la_LIBADD = $(EASCLIENT_LIBS) $(SYNCEVOLU
 src_backends_activesync_syncactivesync_la_LDFLAGS = -no-undefined -module -avoid-version
 src_backends_activesync_syncactivesync_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
 src_backends_activesync_syncactivesync_la_CXXFLAGS = $(EASCLIENT_CFLAGS) $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS) $(LIBICAL_CFLAGS) $(GLIB_CFLAGS) $(GOBJECT_CFLAGS)
-src_backends_activesync_syncactivesync_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS) $(EASCLIENT_DEPENDENCIES)
+src_backends_activesync_syncactivesync_la_DEPENDENCIES = src/syncevo/libsyncevolution.la $(EASCLIENT_DEPENDENCIES)
 
 # activated by EASCLIENT_DEPENDENCIES: usually empty, unless --with-activesyncd-src is used
 $(src_backends_activesync_src) src/backends/activesync/ActiveSyncSourceRegister.cpp: $(EASCLIENT_DEPENDENCIES)
diff --git a/src/backends/addressbook/addressbook.am b/src/backends/addressbook/addressbook.am
index 2da312fd..57657ec3 100644
--- a/src/backends/addressbook/addressbook.am
+++ b/src/backends/addressbook/addressbook.am
@@ -19,4 +19,4 @@ src_backends_addressbook_syncaddressbook_la_LIBADD = $(ADDRESSBOOK_LIBS) $(SYNCE
 src_backends_addressbook_syncaddressbook_la_LDFLAGS = -module -avoid-version
 src_backends_addressbook_syncaddressbook_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS)
 src_backends_addressbook_syncaddressbook_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
-src_backends_addressbook_syncaddressbook_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS)
+src_backends_addressbook_syncaddressbook_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
diff --git a/src/backends/akonadi/akonadi.am b/src/backends/akonadi/akonadi.am
index 48b6756d..271bb8d3 100644
--- a/src/backends/akonadi/akonadi.am
+++ b/src/backends/akonadi/akonadi.am
@@ -18,4 +18,4 @@ src_backends_akonadi_syncakonadi_la_LIBADD = $(KDEPIM_LIBS) $(SYNCEVOLUTION_LIBS
 src_backends_akonadi_syncakonadi_la_LDFLAGS = -module -avoid-version
 src_backends_akonadi_syncakonadi_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS)
 src_backends_akonadi_syncakonadi_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
-src_backends_akonadi_syncakonadi_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS)
+src_backends_akonadi_syncakonadi_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
diff --git a/src/backends/evolution/evolution.am b/src/backends/evolution/evolution.am
index fb2d6b13..a546342b 100644
--- a/src/backends/evolution/evolution.am
+++ b/src/backends/evolution/evolution.am
@@ -46,11 +46,11 @@ src_backends_evolution_syncecal_la_CPPFLAGS = -D_GNU_SOURCE \
   $(src_backends_evolution_cppflags)
 src_backends_evolution_syncecal_la_LDFLAGS = -module -avoid-version -ldl
 src_backends_evolution_syncecal_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS) $(GLIB_CFLAGS) $(GOBJECT_CFLAGS)
-src_backends_evolution_syncecal_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS)
+src_backends_evolution_syncecal_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
 
 src_backends_evolution_syncebook_la_SOURCES = $(src_backends_evolution_syncebook_src)
 src_backends_evolution_syncebook_la_LIBADD = $(EBOOK_LIBS) $(SYNCEVOLUTION_LIBS) $(GLIB_LIBS) $(GOBJECT_LIBS)
 src_backends_evolution_syncebook_la_LDFLAGS = -module -avoid-version
 src_backends_evolution_syncebook_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS) $(GLIB_CFLAGS) $(GOBJECT_CFLAGS)
 src_backends_evolution_syncebook_la_CPPFLAGS = $(src_backends_evolution_cppflags)
-src_backends_evolution_syncebook_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS)
+src_backends_evolution_syncebook_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
diff --git a/src/backends/file/file.am b/src/backends/file/file.am
index 9ecb2ed3..3c1fd889 100644
--- a/src/backends/file/file.am
+++ b/src/backends/file/file.am
@@ -18,7 +18,7 @@ src_backends_file_syncfile_la_LIBADD = $(FILE_LIBS) $(SYNCEVOLUTION_LIBS)
 src_backends_file_syncfile_la_LDFLAGS = -module -avoid-version
 src_backends_file_syncfile_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS)
 src_backends_file_syncfile_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
-src_backends_file_syncfile_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS)
+src_backends_file_syncfile_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
 # If you need special test cases for your sync source, then
 # install them here. Here's how the sqlite backend does that:
 #
diff --git a/src/backends/gnome/gnome.am b/src/backends/gnome/gnome.am
index 15b93336..348a014d 100644
--- a/src/backends/gnome/gnome.am
+++ b/src/backends/gnome/gnome.am
@@ -20,4 +20,4 @@ src_backends_gnome_platformgnome_la_LIBADD = $(KEYRING_LIBS) $(SYNCEVOLUTION_LIB
 src_backends_gnome_platformgnome_la_LDFLAGS = -module -avoid-version
 src_backends_gnome_platformgnome_la_CXXFLAGS = $(KEYRING_CFLAGS) $(SYNCEVOLUTION_CFLAGS)
 src_backends_gnome_platformgnome_la_CPPFLAGS = -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
-src_backends_gnome_platformgnome_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS)
+src_backends_gnome_platformgnome_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
diff --git a/src/backends/kcalextended/kcalextended.am b/src/backends/kcalextended/kcalextended.am
index ef1ab6d3..2bf1f4ea 100644
--- a/src/backends/kcalextended/kcalextended.am
+++ b/src/backends/kcalextended/kcalextended.am
@@ -16,4 +16,4 @@ src_backends_kcalextended_synckcalextended_la_LIBADD = $(KCALEXTENDED_LIBS) $(SY
 src_backends_kcalextended_synckcalextended_la_LDFLAGS = -module -avoid-version
 src_backends_kcalextended_synckcalextended_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(KCALEXTENDED_CFLAGS) $(SYNCEVO_WFLAGS)
 src_backends_kcalextended_synckcalextended_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
-src_backends_kcalextended_synckcalextended_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS)
+src_backends_kcalextended_synckcalextended_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
diff --git a/src/backends/kde/kde.am b/src/backends/kde/kde.am
index 820f87e0..bc049376 100644
--- a/src/backends/kde/kde.am
+++ b/src/backends/kde/kde.am
@@ -20,4 +20,4 @@ src_backends_kde_platformkde_la_LIBADD = $(KDE_KWALLET_LIBS) $(SYNCEVOLUTION_LIB
 src_backends_kde_platformkde_la_LDFLAGS = -module -avoid-version
 src_backends_kde_platformkde_la_CXXFLAGS = $(KDE_KWALLET_CFLAGS) $(SYNCEVOLUTION_CFLAGS)
 src_backends_kde_platformkde_la_CPPFLAGS = -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
-src_backends_kde_platformkde_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS)
+src_backends_kde_platformkde_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
diff --git a/src/backends/maemo/maemo.am b/src/backends/maemo/maemo.am
index 922f94d3..9c31b8de 100644
--- a/src/backends/maemo/maemo.am
+++ b/src/backends/maemo/maemo.am
@@ -18,4 +18,4 @@ src_backends_maemo_syncmaemocal_la_LIBADD = $(MCALB_LIBS) $(SYNCEVOLUTION_LIBS)
 src_backends_maemo_syncmaemocal_la_LDFLAGS = -module -avoid-version
 src_backends_maemo_syncmaemocal_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS)
 src_backends_maemo_syncmaemocal_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
-src_backends_maemo_syncmaemocal_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS)
+src_backends_maemo_syncmaemocal_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
diff --git a/src/backends/pbap/pbap.am b/src/backends/pbap/pbap.am
index 50c5860d..49071693 100644
--- a/src/backends/pbap/pbap.am
+++ b/src/backends/pbap/pbap.am
@@ -18,7 +18,7 @@ src_backends_pbap_syncpbap_la_LIBADD = $(PBAP_LIBS) $(PCRECPP_LIBS) $(SYNCEVOLUT
 src_backends_pbap_syncpbap_la_LDFLAGS = -module -avoid-version $(DBUS_LIBS)
 src_backends_pbap_syncpbap_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS) $(DBUS_CFLAGS)
 src_backends_pbap_syncpbap_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(gdbus_dir) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
-src_backends_pbap_syncpbap_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS) $(gdbus_build_dir)/libgdbussyncevo.la
+src_backends_pbap_syncpbap_la_DEPENDENCIES = src/syncevo/libsyncevolution.la $(gdbus_build_dir)/libgdbussyncevo.la
 
 # If you need special test cases for your sync source, then
 # install them here. Here's how the sqlite backend does that:
diff --git a/src/backends/qtcontacts/qtcontacts.am b/src/backends/qtcontacts/qtcontacts.am
index 4fb71024..ff423fee 100644
--- a/src/backends/qtcontacts/qtcontacts.am
+++ b/src/backends/qtcontacts/qtcontacts.am
@@ -15,7 +15,7 @@ src_backends_qtcontacts_syncqtcontacts_la_SOURCES = \
 src_backends_qtcontacts_syncqtcontacts_la_LIBADD = $(QT_CONTACTS_LIBS) $(QT_LIBS) $(SYNCEVOLUTION_LIBS)
 src_backends_qtcontacts_syncqtcontacts_la_LDFLAGS = -module -avoid-version $(QT_LDFLAGS)
 src_backends_qtcontacts_syncqtcontacts_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS) $(QT_CPPFLAGS)
-src_backends_qtcontacts_syncqtcontacts_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS)
+src_backends_qtcontacts_syncqtcontacts_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
 # Allow Qt to set some compile flags, but not the ones normally set via configure.
 # In particular -W is not compatible with the SyncEvolution header files (we have
 # unused parameters in some inline functions).
diff --git a/src/backends/sqlite/sqlite.am b/src/backends/sqlite/sqlite.am
index 041744cf..cd798929 100644
--- a/src/backends/sqlite/sqlite.am
+++ b/src/backends/sqlite/sqlite.am
@@ -22,7 +22,7 @@ src_backends_sqlite_syncsqlite_la_LIBADD = $(SQLITE_LIBS) $(SYNCEVOLUTION_LIBS)
 src_backends_sqlite_syncsqlite_la_LDFLAGS = -module -avoid-version
 src_backends_sqlite_syncsqlite_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS)
 src_backends_sqlite_syncsqlite_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS) -I$(top_srcdir)/src/backends/sqlite
-src_backends_sqlite_syncsqlite_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS)
+src_backends_sqlite_syncsqlite_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
 
 # SQLiteContactSource does not support all fields from Funambol vCard 2.1
 # test cases: filter them out before testing
diff --git a/src/backends/webdav/webdav.am b/src/backends/webdav/webdav.am
index 10b2075b..16539e32 100644
--- a/src/backends/webdav/webdav.am
+++ b/src/backends/webdav/webdav.am
@@ -37,7 +37,7 @@ src_backends_webdav_syncdav_la_LIBADD = $(NEON_LIBS) $(SYNCEVOLUTION_LIBS) $(LIB
 src_backends_webdav_syncdav_la_LDFLAGS = -module -avoid-version
 src_backends_webdav_syncdav_la_CXXFLAGS = $(NEON_CFLAGS) $(SYNCEVO_WFLAGS) $(LIBICAL_CFLAGS)
 src_backends_webdav_syncdav_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
-src_backends_webdav_syncdav_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS)
+src_backends_webdav_syncdav_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
 
 if NEON_COMPATIBILITY
 all_local_installchecks += webdav_so_check
diff --git a/src/backends/xmlrpc/xmlrpc.am b/src/backends/xmlrpc/xmlrpc.am
index 58435a24..abe538cc 100644
--- a/src/backends/xmlrpc/xmlrpc.am
+++ b/src/backends/xmlrpc/xmlrpc.am
@@ -20,7 +20,7 @@ src_backends_xmlrpc_syncxmlrpc_la_LIBADD = $(XMLRPC_LIBS) $(SYNCEVOLUTION_LIBS)
 src_backends_xmlrpc_syncxmlrpc_la_LDFLAGS = -module -avoid-version
 src_backends_xmlrpc_syncxmlrpc_la_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(SYNCEVO_WFLAGS)
 src_backends_xmlrpc_syncxmlrpc_la_CPPFLAGS = $(SYNCEVOLUTION_CFLAGS) -I$(top_srcdir)/test $(BACKEND_CPPFLAGS)
-src_backends_xmlrpc_syncxmlrpc_la_DEPENDENCIES = $(SYNCEVOLUTION_LIBS)
+src_backends_xmlrpc_syncxmlrpc_la_DEPENDENCIES = src/syncevo/libsyncevolution.la
 # If you need special test cases for your sync source, then
 # install them here. Here's how the sqlite backend does that:
 #