Use -no-undefined on Linux too

There still left two things opened, search for KILL-BONOBO to find them.
One is in calendar's Makefile.am, one in composer.

21 files changed, 51 insertions, 65 deletions

diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index fb77e5a3be..edfe538d3a 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -22,6 +22,10 @@ plugin_LTLIBRARIES = liborg-gnome-evolution-attachment-reminder.la
 liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c 
 liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_evolution_attachment_reminder_la_LIBADD =	\
+	$(top_builddir)/composer/libcomposer.la		\
+	$(top_builddir)/shell/libeshell.la		\
+	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
+	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
 	$(top_builddir)/mail/libevolution-module-mail.la	\
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index 1bf7604e92..ac42633ed6 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/Makefile.am
@@ -14,6 +14,9 @@ liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c
 liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_evolution_bbdb_la_LIBADD =		\
 	$(top_builddir)/e-util/libeutil.la	\
+	$(top_builddir)/composer/libcomposer.la	\
+	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
+	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml
diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am
index 5dc0cc626c..afa24a0d71 100644
--- a/plugins/bogo-junk-plugin/Makefile.am
+++ b/plugins/bogo-junk-plugin/Makefile.am
@@ -11,8 +11,10 @@ plugin_LTLIBRARIES = liborg-gnome-bogo-junk-plugin.la
 liborg_gnome_bogo_junk_plugin_la_SOURCES = bf-junk-filter.c
 liborg_gnome_bogo_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_bogo_junk_plugin_la_LIBADD =	\
-	$(GNOME_PLATFORM_LIBS) \
-	$(top_builddir)/e-util/libeutil.la
+	$(top_builddir)/mail/libevolution-module-mail.la	\
+	$(top_builddir)/e-util/libeutil.la	\
+	$(EVOLUTION_MAIL_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = bogo-junk-plugin.schemas.in
diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am
index 19539907fa..ca934e5e78 100644
--- a/plugins/email-custom-header/Makefile.am
+++ b/plugins/email-custom-header/Makefile.am
@@ -24,8 +24,7 @@ liborg_gnome_email_custom_header_la_LIBADD = 			\
 	$(top_builddir)/e-util/libeutil.la 			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/mail/libevolution-mail.la 		\
-	$(EVOLUTION_MAIL_LIBS)					\
-	$(NO_UNDEFINED_REQUIRED_LIBS)				
+	$(EVOLUTION_MAIL_LIBS)
 
 liborg_gnome_email_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am
index 4373b81ee5..76234e3533 100644
--- a/plugins/external-editor/Makefile.am
+++ b/plugins/external-editor/Makefile.am
@@ -1,11 +1,3 @@
-if OS_WIN32
-NO_UNDEFINED_REQUIRED_LIBS = \
-	$(EVOLUTION_MAIL_LIBS) \
-	$(GNOME_PLATFORM_LIBS) \
-	$(top_builddir)/e-util/libeutil.la \
-	$(top_builddir)/mail/libevolution-mail.la
-endif
-
 INCLUDES =						\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\"	\
@@ -35,8 +27,15 @@ liborg_gnome_external_editor_la_SOURCES = 		\
 
 liborg_gnome_external_editor_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
-liborg_gnome_external_editor_la_LIBADD = \
-	$(NO_UNDEFINED_REQUIRED_LIBS)
+liborg_gnome_external_editor_la_LIBADD = 			\
+	$(top_builddir)/e-util/libeutil.la 			\
+	$(top_builddir)/composer/libcomposer.la 		\
+	$(top_builddir)/shell/libeshell.la			\
+	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la 		\
+	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la	\
+	$(top_builddir)/mail/libevolution-module-mail.la	\
+	$(EVOLUTION_MAIL_LIBS)					\
+	$(GNOME_PLATFORM_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = apps-evolution-external-editor.schemas.in
diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am
index 2b6bfdb7be..afe36942c9 100644
--- a/plugins/face/Makefile.am
+++ b/plugins/face/Makefile.am
@@ -23,8 +23,7 @@ liborg_gnome_face_la_LIBADD = 			\
 	$(top_builddir)/e-util/libeutil.la 			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/mail/libevolution-mail.la 		\
-	$(EVOLUTION_MAIL_LIBS)					\
-	$(NO_UNDEFINED_REQUIRED_LIBS)				
+	$(EVOLUTION_MAIL_LIBS)
 
 liborg_gnome_face_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am
index 3b0a83021d..42b68c58ec 100644
--- a/plugins/groupwise-features/Makefile.am
+++ b/plugins/groupwise-features/Makefile.am
@@ -1,7 +1,3 @@
-if OS_WIN32
-NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la
-endif
-
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
@@ -46,7 +42,6 @@ liborg_gnome_groupwise_features_la_LIBADD=			\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/filter/libfilter.la			\
-	$(NO_UNDEFINED_REQUIRED_LIBS)				\
 	$(EVOLUTION_CALENDAR_LIBS)				\
 	$(EVOLUTION_MAIL_LIBS)					\
 	$(CAMEL_GROUPWISE_LIBS)
diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am
index 3b73e2741d..b0f34f1ed7 100644
--- a/plugins/imap-features/Makefile.am
+++ b/plugins/imap-features/Makefile.am
@@ -1,7 +1,3 @@
-if OS_WIN32
-NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la
-endif
-
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/mail				\
@@ -19,8 +15,9 @@ plugin_LTLIBRARIES = liborg-gnome-imap-features.la
 liborg_gnome_imap_features_la_SOURCES = 	\
 	imap-headers.c	
 
-liborg_gnome_imap_features_la_LIBADD=		\
-	$(NO_UNDEFINED_REQUIRED_LIBS)		\
+liborg_gnome_imap_features_la_LIBADD=				\
+	$(top_builddir)/e-util/libeutil.la 			\
+	$(top_builddir)/mail/libevolution-module-mail.la	\
 	$(EVOLUTION_MAIL_LIBS)					
 
 
diff --git a/plugins/ipod-sync/Makefile.am b/plugins/ipod-sync/Makefile.am
index 570683442e..218dd933dd 100644
--- a/plugins/ipod-sync/Makefile.am
+++ b/plugins/ipod-sync/Makefile.am
@@ -16,7 +16,7 @@ liborg_gnome_ipod_sync_evolution_la_SOURCES = \
 	format-handler.h                \
 	evolution-ipod-sync.h
 
-liborg_gnome_ipod_sync_evolution_la_LDFLAGS = -module -avoid-version
+liborg_gnome_ipod_sync_evolution_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_ipod_sync_evolution_la_LIBADD = 			\
 	$(EVOLUTION_CALENDAR_LIBS)
 
diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am
index f3434fd4e8..629697f7d1 100644
--- a/plugins/mail-notification/Makefile.am
+++ b/plugins/mail-notification/Makefile.am
@@ -1,10 +1,3 @@
-if OS_WIN32
-NO_UNDEFINED_REQUIRED_LIBS =				\
-	$(top_builddir)/mail/libevolution-mail.la	\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(GNOME_PLATFORM_LIBS)
-endif
-
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\
@@ -25,9 +18,11 @@ plugin_LTLIBRARIES = liborg-gnome-mail-notification.la
 liborg_gnome_mail_notification_la_SOURCES = mail-notification.c
 liborg_gnome_mail_notification_la_LDFLAGS = 	\
 	-module -avoid-version $(NO_UNDEFINED)
-liborg_gnome_mail_notification_la_LIBADD = 	\
-	$(LIBNOTIFY_LIBS)			\
-	$(NO_UNDEFINED_REQUIRED_LIBS)
+liborg_gnome_mail_notification_la_LIBADD = 			\
+	$(LIBNOTIFY_LIBS)					\
+	$(top_builddir)/e-util/libeutil.la 			\
+	$(top_builddir)/mail/libevolution-module-mail.la	\
+	$(GNOME_PLATFORM_LIBS)
 
 if ENABLE_DBUS
 liborg_gnome_mail_notification_la_LDFLAGS += $(NMN_LIBS)
diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am
index 5c9feb1832..dbd18dce83 100644
--- a/plugins/mark-all-read/Makefile.am
+++ b/plugins/mark-all-read/Makefile.am
@@ -13,6 +13,7 @@ liborg_gnome_mark_all_read_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_mark_all_read_la_LIBADD = 			\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/mail/libevolution-module-mail.la	\
+	$(top_builddir)/shell/libeshell.la			\
 	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST = org-gnome-mark-all-read.eplug.xml
diff --git a/plugins/mono/Makefile.am b/plugins/mono/Makefile.am
index f98e8be2ab..6404920982 100644
--- a/plugins/mono/Makefile.am
+++ b/plugins/mono/Makefile.am
@@ -9,7 +9,7 @@ plugin_DATA = org-gnome-evolution-mono.eplug
 plugin_LTLIBRARIES = liborg-gnome-evolution-mono.la
 
 liborg_gnome_evolution_mono_la_SOURCES = mono-plugin.c mono-plugin.h
-liborg_gnome_evolution_mono_la_LDFLAGS = -module -avoid-version
+liborg_gnome_evolution_mono_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_evolution_mono_la_LIBADD =	\
 	$(E_UTIL_LIBS)			\
 	$(MONO_LIBS)
diff --git a/plugins/plugin-manager/Makefile.am b/plugins/plugin-manager/Makefile.am
index 087c8964a3..ab3c2ceb98 100644
--- a/plugins/plugin-manager/Makefile.am
+++ b/plugins/plugin-manager/Makefile.am
@@ -11,6 +11,7 @@ liborg_gnome_plugin_manager_la_SOURCES = plugin-manager.c
 liborg_gnome_plugin_manager_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_plugin_manager_la_LIBADD =			\
 	$(top_builddir)/e-util/libeutil.la		\
+	$(top_builddir)/shell/libeshell.la		\
 	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST = \
diff --git a/plugins/profiler/Makefile.am b/plugins/profiler/Makefile.am
index 037219c5ed..4a8a45910b 100644
--- a/plugins/profiler/Makefile.am
+++ b/plugins/profiler/Makefile.am
@@ -10,7 +10,7 @@ plugin_DATA = org-gnome-evolution-profiler.eplug
 plugin_LTLIBRARIES = liborg-gnome-evolution-profiler.la
 
 liborg_gnome_evolution_profiler_la_SOURCES = profiler.c
-liborg_gnome_evolution_profiler_la_LDFLAGS = -module -avoid-version
+liborg_gnome_evolution_profiler_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 EXTRA_DIST = org-gnome-evolution-profiler.eplug.xml
 
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
index 0bb5fe43e1..b4b4f482aa 100644
--- a/plugins/pst-import/Makefile.am
+++ b/plugins/pst-import/Makefile.am
@@ -1,11 +1,3 @@
-if OS_WIN32
-NO_UNDEFINED_REQUIRED_LIBS =				\
-	$(top_builddir)/mail/libevolution-mail.la	\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(EVOLUTION_CALENDAR_LIBS)			\
-	$(EVOLUTION_MAIL_LIBS)
-endif
-
 INCLUDES =						\
 	-I$(EVOLUTION_SOURCE)				\
 	-I$(top_srcdir)					\
@@ -24,7 +16,6 @@ liborg_gnome_pst_import_la_SOURCES = pst-importer.c
 liborg_gnome_pst_import_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_pst_import_la_LIBADD =	\
-	$(NO_UNDEFINED_REQUIRED_LIBS)	\
 	$(LIBPST_LIBS)
 
 EXTRA_DIST = org-gnome-pst-import.eplug.xml
diff --git a/plugins/python/Makefile.am b/plugins/python/Makefile.am
index 77441e0e9b..51cc65dcc2 100644
--- a/plugins/python/Makefile.am
+++ b/plugins/python/Makefile.am
@@ -9,7 +9,7 @@ plugin_DATA = org-gnome-evolution-python.eplug
 plugin_LTLIBRARIES = liborg-gnome-evolution-python.la
 
 liborg_gnome_evolution_python_la_SOURCES = python-plugin-loader.c python-plugin-loader.h
-liborg_gnome_evolution_python_la_LDFLAGS = -module -avoid-version
+liborg_gnome_evolution_python_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_evolution_python_la_LIBADD =	\
 	-lpthread -ldl -lutil -lm \
 	$(PY_LIBS) \
diff --git a/plugins/python/example/Makefile.am b/plugins/python/example/Makefile.am
index b3530d841c..a57ed573c1 100644
--- a/plugins/python/example/Makefile.am
+++ b/plugins/python/example/Makefile.am
@@ -9,9 +9,6 @@ plugin_DATA = \
 	org-gnome-hello-python-ui.xml				\
 	org-gnome-hello-python.eplug
 
-liborg_gnome_py_plug_test_la_LIBADD=			\
-	$(NO_UNDEFINED_REQUIRED_LIBS)		
-
 liborg_gnome_py_plug_test_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 errordir = $(privdatadir)/errors
diff --git a/plugins/sa-junk-plugin/Makefile.am b/plugins/sa-junk-plugin/Makefile.am
index 4e44fa5c3b..dfbddb45e3 100644
--- a/plugins/sa-junk-plugin/Makefile.am
+++ b/plugins/sa-junk-plugin/Makefile.am
@@ -10,6 +10,11 @@ plugin_LTLIBRARIES = liborg-gnome-sa-junk-plugin.la
 liborg_gnome_sa_junk_plugin_la_SOURCES = em-junk-filter.c
 liborg_gnome_sa_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
+liborg_gnome_sa_junk_plugin_la_LIBADD =	\
+	$(top_builddir)/mail/libevolution-module-mail.la	\
+	$(top_builddir)/e-util/libeutil.la	\
+	$(EVOLUTION_MAIL_LIBS)			\
+	$(GNOME_PLATFORM_LIBS)
 
 BUILT_SOURCES = $(plugin_DATA) $(error_DATA)
 
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index 6ea2ce1f3e..f216d7f418 100644
--- a/plugins/tnef-attachments/Makefile.am
+++ b/plugins/tnef-attachments/Makefile.am
@@ -1,11 +1,3 @@
-if OS_WIN32
-NO_UNDEFINED_REQUIRED_LIBS = 				\
-	$(EVOLUTION_MAIL_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)				\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(top_builddir)/mail/libevolution-mail.la
-endif
-
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
@@ -21,7 +13,6 @@ plugin_LTLIBRARIES = liborg-gnome-tnef-attachments.la
 liborg_gnome_tnef_attachments_la_SOURCES = tnef-plugin.c
 liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version  $(NO_UNDEFINED)
 liborg_gnome_tnef_attachments_la_LIBADD = 		\
-	$(NO_UNDEFINED_REQUIRED_LIBS)			\
 	-lytnef
 
 EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index f0152862f3..6964d07e10 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -46,7 +46,7 @@
 #include <camel/camel-multipart.h>
 #include <camel/camel-stream-fs.h>
 
-#include <mail/em-format.h>
+#include <em-format/em-format.h>
 #include <mail/em-format-hook.h>
 #include <mail/em-utils.h>
 #include <e-util/e-error.h>
@@ -160,7 +160,7 @@ org_gnome_format_tnef(void *ep, EMFormatHookTarget *t)
 		camel_medium_set_content_object((CamelMedium *)part, content);
 		camel_object_unref(content);
 
-		type = em_utils_snoop_type(part);
+		type = em_format_snoop_type(part);
 		if (type)
 		    camel_data_wrapper_set_mime_type((CamelDataWrapper *)part, type);
 
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
index 781eb53bd4..f3c20d1c59 100644
--- a/plugins/vcard-inline/Makefile.am
+++ b/plugins/vcard-inline/Makefile.am
@@ -11,10 +11,17 @@ plugin_LTLIBRARIES = liborg-gnome-vcard-inline.la
 liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c
 liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_vcard_inline_la_LIBADD =	\
-	$(EVOLUTION_ADDRESSBOOK_LIBS)
+	$(top_builddir)/mail/libevolution-module-mail.la	\
+	$(top_builddir)/addressbook/util/libeabutil.la		\
+	$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la		\
+	$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la		\
+	$(top_builddir)/addressbook/printing/libecontactprint.la		\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)	\
 	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST = org-gnome-vcard-inline.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk