Bug #591436 - Add -avoid-version to LDFLAGS

26 files changed, 26 insertions, 27 deletions

diff --git a/a11y/Makefile.am b/a11y/Makefile.am
index 1f218dc99b..50f603f009 100644
--- a/a11y/Makefile.am
+++ b/a11y/Makefile.am
@@ -14,7 +14,7 @@ libevolution_a11y_la_SOURCES =		\
 	gal-a11y-util.h			\
 	gal-a11y-factory.h
 
-libevolution_a11y_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_a11y_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libevolution_a11y_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la	\
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 9c1e553400..d67a21bba2 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -24,7 +24,7 @@ libecontacteditor_la_SOURCES = 			\
 	e-contact-quick-add.c			\
 	e-contact-quick-add.h
 
-libecontacteditor_la_LDFLAGS = $(NO_UNDEFINED)
+libecontacteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libecontacteditor_la_LIBADD =						\
 	$(top_builddir)/e-util/libeutil.la				\
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index bcd398955d..efd1964eb3 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -19,7 +19,7 @@ libecontactlisteditor_la_SOURCES = 		\
 	e-contact-list-model.c			\
 	e-contact-list-model.h
 
-libecontactlisteditor_la_LDFLAGS = $(NO_UNDEFINED)
+libecontactlisteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libecontactlisteditor_la_LIBADD =				\
 	$(top_builddir)/addressbook/util/libeabutil.la		\
diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am
index ea29cdc38b..2c5f587f5c 100644
--- a/addressbook/importers/Makefile.am
+++ b/addressbook/importers/Makefile.am
@@ -18,7 +18,7 @@ libevolution_addressbook_importers_la_SOURCES = \
 	evolution-csv-importer.c	        \
 	evolution-addressbook-importers.h
 
-libevolution_addressbook_importers_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_addressbook_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libevolution_addressbook_importers_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la 				\
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am
index ea70fbb9ca..c27b18c67c 100644
--- a/addressbook/util/Makefile.am
+++ b/addressbook/util/Makefile.am
@@ -18,7 +18,7 @@ libeabutil_la_SOURCES =					\
 	eab-book-util.c					\
 	eab-book-util.h
 
-libeabutil_la_LDFLAGS = $(NO_UNDEFINED)
+libeabutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libeabutil_la_LIBADD =					\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la \
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index a5f9a7013d..b06c1fc460 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -218,7 +218,7 @@ libevolution_calendar_la_LIBADD =					\
 	$(GTKHTML_LIBS)							\
 	$(LIBSOUP_LIBS)
 
-libevolution_calendar_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_calendar_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 EXTRA_DIST =	 			\
 	$(ui_DATA)			\
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index b16109978e..7480358f27 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -16,7 +16,7 @@ libevolution_calendar_importers_la_SOURCES = \
 	evolution-calendar-importer.h	     \
 	icalendar-importer.c
 
-libevolution_calendar_importers_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_calendar_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libevolution_calendar_importers_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la 			\
diff --git a/capplet/settings/Makefile.am b/capplet/settings/Makefile.am
index db899e0f6c..0b69914c48 100644
--- a/capplet/settings/Makefile.am
+++ b/capplet/settings/Makefile.am
@@ -63,5 +63,5 @@ libevolution_mail_settings_la_LIBADD = 				\
 	$(top_builddir)/libemail-engine/libemail-engine.la \
 	$(top_builddir)/e-util/libeutil.la
 
-libevolution_mail_settings_la_LDFLAGS =  $(NO_UNDEFINED)
+libevolution_mail_settings_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
diff --git a/composer/Makefile.am b/composer/Makefile.am
index cee00a002b..8fd81a2cd1 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -54,7 +54,7 @@ libcomposer_la_SOURCES = 			\
 	e-composer-text-header.c		\
 	e-msg-composer.c
 
-libcomposer_la_LDFLAGS = $(NO_UNDEFINED)
+libcomposer_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libcomposer_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la		\
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 41a99316ef..d9d3a56884 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -121,7 +121,7 @@ libeutil_la_SOURCES =				\
 	e-xml-utils.c				\
 	$(PLATFORM_SOURCES)
 
-libeutil_la_LDFLAGS = $(NO_UNDEFINED)
+libeutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libeutil_la_LIBADD = 			\
 	$(ICONV_LIBS)			\
diff --git a/em-format/Makefile.am b/em-format/Makefile.am
index 07ff63cc2a..278bcb2527 100644
--- a/em-format/Makefile.am
+++ b/em-format/Makefile.am
@@ -22,7 +22,7 @@ libemformat_la_SOURCES =				\
 	em-inline-filter.c				\
 	em-stripsig-filter.c
 
-libemformat_la_LDFLAGS = $(NO_UNDEFINED)
+libemformat_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libemformat_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la		\
diff --git a/filter/Makefile.am b/filter/Makefile.am
index e28014559b..ad8c9b3886 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -53,7 +53,7 @@ libfilter_la_SOURCES =				\
 	e-rule-editor.c				\
 	e-rule-editor.h
 
-libfilter_la_LDFLAGS = $(NO_UNDEFINED)
+libfilter_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libfilter_la_LIBADD = 				\
 	$(top_builddir)/e-util/libeutil.la	\
diff --git a/libemail-engine/Makefile.am b/libemail-engine/Makefile.am
index 61ba709153..ff888679cb 100644
--- a/libemail-engine/Makefile.am
+++ b/libemail-engine/Makefile.am
@@ -57,7 +57,7 @@ libemail_engine_la_LIBADD = \
 	$(GNOME_PLATFORM_LIBS) \
 	$(NULL)
 
-libemail_engine_la_LDFLAGS = $(NO_UNDEFINED)
+libemail_engine_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libemail-engine.pc
diff --git a/libemail-utils/Makefile.am b/libemail-utils/Makefile.am
index 567f668775..70e6a33b57 100644
--- a/libemail-utils/Makefile.am
+++ b/libemail-utils/Makefile.am
@@ -29,7 +29,7 @@ libemail_utils_la_SOURCES = \
 	mail-mt.c \
 	$(NULL)
 
-libemail_utils_la_LDFLAGS = $(NO_UNDEFINED)
+libemail_utils_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libemail_utils_la_LIBADD = \
 	$(EVOLUTION_DATA_SERVER_LIBS) \
diff --git a/libgnomecanvas/Makefile.am b/libgnomecanvas/Makefile.am
index bb6366b9ab..2346471058 100644
--- a/libgnomecanvas/Makefile.am
+++ b/libgnomecanvas/Makefile.am
@@ -62,7 +62,7 @@ libgnomecanvas_la_LIBADD = \
 	$(GNOME_PLATFORM_LIBS) \
 	$(MATH_LIB)
 
-libgnomecanvas_la_LDFLAGS = $(NO_UNDEFINED)
+libgnomecanvas_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 BUILT_SOURCES = $(MARSHAL_GENERATED)
 
diff --git a/mail/Makefile.am b/mail/Makefile.am
index b80d56cb8e..0273c245f6 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -195,7 +195,7 @@ libevolution_mail_la_LIBADD =				\
 	$(GTKHTML_LIBS)					\
 	$(SMIME_LIBS)
 
-libevolution_mail_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_mail_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
 
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index 6a7e9a8b6e..6d40087a3f 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -19,7 +19,7 @@ libevolution_mail_importers_la_SOURCES =	\
 	pine-importer.c				\
 	evolution-mbox-importer.c
 
-libevolution_mail_importers_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_mail_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libevolution_mail_importers_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la			\
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 57b9b0c75d..4e01ee76e3 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -87,7 +87,7 @@ libeshell_la_SOURCES =				\
 	e-shell-window-actions.c		\
 	es-event.c
 
-libeshell_la_LDFLAGS = $(NO_UNDEFINED)
+libeshell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libeshell_la_LIBADD =					\
 	$(top_builddir)/libemail-utils/libemail-utils.la		\
diff --git a/smclient/Makefile.am b/smclient/Makefile.am
index cbc004fa36..775eee085c 100644
--- a/smclient/Makefile.am
+++ b/smclient/Makefile.am
@@ -22,8 +22,7 @@ libeggsmclient_la_LIBADD = \
 	$(EGG_SMCLIENT_LIBS) \
 	$(platform_libs)
 
-libeggsmclient_la_LDFLAGS = \
-	$(platform_ldflags)
+libeggsmclient_la_LDFLAGS = -avoid-version $(platform_ldflags)
 
 libeggsmclient_la_SOURCES = \
 	eggsmclient.c \
diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am
index c8fe999fc7..748a54b123 100644
--- a/smime/gui/Makefile.am
+++ b/smime/gui/Makefile.am
@@ -45,7 +45,7 @@ libevolution_smime_la_LIBADD =				\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(CERT_UI_LIBS)
 
-libevolution_smime_la_LDFLAGS = $(NO_UNDEFINED)
+libevolution_smime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 ui_DATA = smime-ui.ui
 
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am
index 9ed6067c0e..5ef47070d4 100644
--- a/smime/lib/Makefile.am
+++ b/smime/lib/Makefile.am
@@ -35,6 +35,6 @@ libessmime_la_LIBADD =				\
 	$(GNOME_PLATFORM_LIBS)			\
 	$(CERT_UI_LIBS)
 
-libessmime_la_LDFLAGS = $(NO_UNDEFINED)
+libessmime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 -include $(top_srcdir)/git.mk
diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am
index 396ce6a4a5..25f447fb33 100644
--- a/widgets/e-timezone-dialog/Makefile.am
+++ b/widgets/e-timezone-dialog/Makefile.am
@@ -13,7 +13,7 @@ libetimezonedialog_la_SOURCES =	\
 	e-timezone-dialog.c	\
 	e-timezone-dialog.h
 
-libetimezonedialog_la_LDFLAGS = $(NO_UNDEFINED)
+libetimezonedialog_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libetimezonedialog_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la		\
diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am
index 0dc38fce28..1dced7f0ea 100644
--- a/widgets/menus/Makefile.am
+++ b/widgets/menus/Makefile.am
@@ -40,7 +40,7 @@ libmenusinclude_HEADERS =			\
 	gal-view-new-dialog.h			\
 	gal-view.h
 
-libmenus_la_LDFLAGS = $(NO_UNDEFINED)
+libmenus_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libmenus_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la		\
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index d0bef3fa28..c7580fba60 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -150,7 +150,7 @@ libemiscwidgets_la_SOURCES =			\
 	ea-cell-table.c				\
 	ea-widgets.c
 
-libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED)
+libemiscwidgets_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libemiscwidgets_la_LIBADD =					\
 	$(top_builddir)/e-util/libeutil.la			\
diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index 001a2fd1e7..5a82528c8e 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -164,7 +164,7 @@ libetableinclude_HEADERS = 			\
 	gal-a11y-e-tree.h			\
 	gal-a11y-e-tree-factory.h
 
-libetable_la_LDFLAGS = $(NO_UNDEFINED)
+libetable_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libetable_la_LIBADD =						\
 	$(top_builddir)/a11y/libevolution-a11y.la		\
diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am
index 0928da099f..9f8e852dd0 100644
--- a/widgets/text/Makefile.am
+++ b/widgets/text/Makefile.am
@@ -28,7 +28,7 @@ libetextinclude_HEADERS = 			\
 	gal-a11y-e-text-factory.h		\
 	gal-a11y-e-text.h
 
-libetext_la_LDFLAGS = $(NO_UNDEFINED)
+libetext_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 libetext_la_LIBADD = 						\
 	$(top_builddir)/a11y/libevolution-a11y.la		\