Remove some unnecessary linker flags.

10 files changed, 1 insertions, 26 deletions

diff --git a/modules/book-config-google/Makefile.am b/modules/book-config-google/Makefile.am
index c3a290b240..edf8789aac 100644
--- a/modules/book-config-google/Makefile.am
+++ b/modules/book-config-google/Makefile.am
@@ -14,10 +14,6 @@ module_book_config_google_la_SOURCES = \
 module_book_config_google_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
-	$(top_builddir)/addressbook/printing/libecontactprint.la \
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
-	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
-	$(top_builddir)/addressbook/util/libeabutil.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
diff --git a/modules/book-config-ldap/Makefile.am b/modules/book-config-ldap/Makefile.am
index bcb9cd0695..6e957dc8c5 100644
--- a/modules/book-config-ldap/Makefile.am
+++ b/modules/book-config-ldap/Makefile.am
@@ -15,12 +15,9 @@ module_book_config_ldap_la_SOURCES = \
 	e-source-ldap.h
 
 module_book_config_ldap_la_LIBADD = \
+	$(top_builddir)/libevolution-utils/libevolution-utils.la \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
-	$(top_builddir)/addressbook/printing/libecontactprint.la \
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
-	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
-	$(top_builddir)/addressbook/util/libeabutil.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(LDAP_LIBS)
diff --git a/modules/book-config-local/Makefile.am b/modules/book-config-local/Makefile.am
index 234b4825ad..518ea3b52e 100644
--- a/modules/book-config-local/Makefile.am
+++ b/modules/book-config-local/Makefile.am
@@ -14,10 +14,6 @@ module_book_config_local_la_SOURCES = \
 module_book_config_local_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
-	$(top_builddir)/addressbook/printing/libecontactprint.la \
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
-	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
-	$(top_builddir)/addressbook/util/libeabutil.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
diff --git a/modules/book-config-webdav/Makefile.am b/modules/book-config-webdav/Makefile.am
index 3f5f9a24ec..5f3f09cbd6 100644
--- a/modules/book-config-webdav/Makefile.am
+++ b/modules/book-config-webdav/Makefile.am
@@ -14,10 +14,6 @@ module_book_config_webdav_la_SOURCES = \
 module_book_config_webdav_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
-	$(top_builddir)/addressbook/printing/libecontactprint.la \
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
-	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
-	$(top_builddir)/addressbook/util/libeabutil.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
diff --git a/modules/cal-config-caldav/Makefile.am b/modules/cal-config-caldav/Makefile.am
index 8c3d03125a..6905aff473 100644
--- a/modules/cal-config-caldav/Makefile.am
+++ b/modules/cal-config-caldav/Makefile.am
@@ -19,7 +19,6 @@ module_cal_config_caldav_la_SOURCES = \
 module_cal_config_caldav_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
-	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(LIBSOUP_LIBS)
diff --git a/modules/cal-config-contacts/Makefile.am b/modules/cal-config-contacts/Makefile.am
index 59367b9d57..d27d3a06c0 100644
--- a/modules/cal-config-contacts/Makefile.am
+++ b/modules/cal-config-contacts/Makefile.am
@@ -18,11 +18,6 @@ module_cal_config_contacts_la_SOURCES = \
 module_cal_config_contacts_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
-	$(top_builddir)/addressbook/printing/libecontactprint.la \
-	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
-	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
-	$(top_builddir)/addressbook/util/libeabutil.la		\
-	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
diff --git a/modules/cal-config-google/Makefile.am b/modules/cal-config-google/Makefile.am
index f79565a5cc..6467c436f0 100644
--- a/modules/cal-config-google/Makefile.am
+++ b/modules/cal-config-google/Makefile.am
@@ -21,7 +21,6 @@ module_cal_config_google_la_SOURCES = \
 module_cal_config_google_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
-	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GDATA_LIBS)
diff --git a/modules/cal-config-local/Makefile.am b/modules/cal-config-local/Makefile.am
index 3cd8f6d18a..477d31b7eb 100644
--- a/modules/cal-config-local/Makefile.am
+++ b/modules/cal-config-local/Makefile.am
@@ -16,7 +16,6 @@ module_cal_config_local_la_SOURCES = \
 module_cal_config_local_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
-	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
diff --git a/modules/cal-config-weather/Makefile.am b/modules/cal-config-weather/Makefile.am
index 54b6d1e0e0..7276a9d2c0 100644
--- a/modules/cal-config-weather/Makefile.am
+++ b/modules/cal-config-weather/Makefile.am
@@ -17,7 +17,6 @@ module_cal_config_weather_la_SOURCES = \
 module_cal_config_weather_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
-	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GWEATHER_LIBS)
diff --git a/modules/cal-config-webcal/Makefile.am b/modules/cal-config-webcal/Makefile.am
index ef96ebfece..29f9cf27a5 100644
--- a/modules/cal-config-webcal/Makefile.am
+++ b/modules/cal-config-webcal/Makefile.am
@@ -14,7 +14,6 @@ module_cal_config_webcal_la_SOURCES = \
 module_cal_config_webcal_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
-	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)