Use NO_UNDEFINED. Link with more libraries. To generate dlls on Windows.

2008-08-12  Bharath Acharya  <abharath@novell.com>

        * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To
        generate dlls on Windows.


svn path=/trunk/; revision=35960

32 files changed, 146 insertions, 17 deletions

diff --git a/plugins/attachment-reminder/ChangeLog b/plugins/attachment-reminder/ChangeLog
index 1bddccefe0..afba4a04c5 100644
--- a/plugins/attachment-reminder/ChangeLog
+++ b/plugins/attachment-reminder/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Bharath Acharya  <abharath@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
+	dlls on Windows.
+
 2008-06-04  Johnny Jacob  <jjohnny@novell.com>
 
 	** Fixes Bug #208943.
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index 79e4271370..d1d0ca90ee 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -19,7 +19,12 @@ plugin_DATA = 						\
 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
+liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_evolution_attachment_reminder_la_LIBADD =	\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(EVOLUTION_MAIL_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = apps-evolution-attachment-reminder.schemas.in
diff --git a/plugins/audio-inline/ChangeLog b/plugins/audio-inline/ChangeLog
index deecb913e5..d7fe8ddffc 100644
--- a/plugins/audio-inline/ChangeLog
+++ b/plugins/audio-inline/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Bharath Acharya  <abharath@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
+	dlls on Windows.
+
 2008-04-21  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes #528793, solution by Reece Hart
diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am
index 15ced924bf..0780bf0bfc 100644
--- a/plugins/audio-inline/Makefile.am
+++ b/plugins/audio-inline/Makefile.am
@@ -9,8 +9,10 @@ plugin_DATA = org-gnome-audio-inline.eplug
 plugin_LTLIBRARIES = liborg-gnome-audio-inline.la
 
 liborg_gnome_audio_inline_la_SOURCES = audio-inline.c
-liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version
-liborg_gnome_audio_inline_la_LIBADD = $(GSTREAMER_LIBS)
+liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_audio_inline_la_LIBADD =	\
+	$(GSTREAMER_LIBS)		\
+	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST = org-gnome-audio-inline.eplug.xml
 
diff --git a/plugins/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog
index 3dbab34a81..d87b1e8b6b 100644
--- a/plugins/backup-restore/ChangeLog
+++ b/plugins/backup-restore/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Bharath Acharya  <abharath@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
+	dlls on Windows.
+
 2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #543754
diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am
index d83b7fb2f9..eaa5963a4f 100644
--- a/plugins/backup-restore/Makefile.am
+++ b/plugins/backup-restore/Makefile.am
@@ -18,7 +18,9 @@ plugin_DATA = org-gnome-backup-restore.eplug org-gnome-backup-restore.xml
 plugin_LTLIBRARIES = liborg-gnome-backup-restore.la
 
 liborg_gnome_backup_restore_la_SOURCES = backup-restore.c
-liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version
+liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_backup_restore_la_LIBADD =	\
+	$(EVOLUTION_MAIL_LIBS)
 
 privlibexec_PROGRAMS = evolution-backup
 evolution_backup_SOURCES = backup.c
diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog
index 53d5e13f7e..703868747b 100644
--- a/plugins/bbdb/ChangeLog
+++ b/plugins/bbdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Bharath Acharya  <abharath@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
+	dlls on Windows.
+
 2008-08-07  Paul Bolle  <pebolle@tiscali.nl>
 
 	** Fixes bug #546785
diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am
index 2506593d46..1f1ddfea46 100644
--- a/plugins/bbdb/Makefile.am
+++ b/plugins/bbdb/Makefile.am
@@ -10,7 +10,10 @@ plugin_DATA = org-gnome-evolution-bbdb.eplug
 plugin_LTLIBRARIES = liborg-gnome-evolution-bbdb.la
 
 liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c
-liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version
+liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_evolution_bbdb_la_LIBADD =		\
+	$(top_builddir)/e-util/libeutil.la	\
+	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml
 
diff --git a/plugins/copy-tool/ChangeLog b/plugins/copy-tool/ChangeLog
index c53c8075f1..be77eb5834 100644
--- a/plugins/copy-tool/ChangeLog
+++ b/plugins/copy-tool/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Bharath Acharya  <abharath@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
+	dlls on Windows.
+
 2007-04-02  Sankar P  <psankar@novell.com>
 
 	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
diff --git a/plugins/copy-tool/Makefile.am b/plugins/copy-tool/Makefile.am
index 263a0a2da0..d0011ab0fa 100644
--- a/plugins/copy-tool/Makefile.am
+++ b/plugins/copy-tool/Makefile.am
@@ -8,7 +8,9 @@ plugin_DATA = org-gnome-copy-tool.eplug
 plugin_LTLIBRARIES = liborg-gnome-copy-tool.la
 
 liborg_gnome_copy_tool_la_SOURCES = copy-tool.c
-liborg_gnome_copy_tool_la_LDFLAGS = -module -avoid-version
+liborg_gnome_copy_tool_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_copy_tool_la_LIBADD =	\
+	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST = org-gnome-copy-tool.eplug.xml
 
diff --git a/plugins/default-mailer/ChangeLog b/plugins/default-mailer/ChangeLog
index 624324daff..5c52a6f91f 100644
--- a/plugins/default-mailer/ChangeLog
+++ b/plugins/default-mailer/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Bharath Acharya  <abharath@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
+	dlls on Windows.
+
 2007-08-20  Matthew Barnes  <mbarnes@redhat.com>
 
 	* Makefile.am: Fix a distcheck error.
diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am
index 72a74dbe8a..123dc3fcac 100644
--- a/plugins/default-mailer/Makefile.am
+++ b/plugins/default-mailer/Makefile.am
@@ -12,7 +12,10 @@ plugin_DATA        = org-gnome-default-mailer.eplug
 plugin_LTLIBRARIES = liborg-gnome-default-mailer.la
 
 liborg_gnome_default_mailer_la_SOURCES = default-mailer.c
-liborg_gnome_default_mailer_la_LDFLAGS = -module -avoid-version
+liborg_gnome_default_mailer_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_default_mailer_la_LIBADD =	\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(EVOLUTION_MAIL_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in
diff --git a/plugins/folder-unsubscribe/ChangeLog b/plugins/folder-unsubscribe/ChangeLog
index db584a1e04..6f26a1f396 100644
--- a/plugins/folder-unsubscribe/ChangeLog
+++ b/plugins/folder-unsubscribe/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Bharath Acharya  <abharath@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
+	dlls on Windows.
+
 2007-12-20  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #362638
diff --git a/plugins/folder-unsubscribe/Makefile.am b/plugins/folder-unsubscribe/Makefile.am
index a01b43d78e..2c11596c51 100644
--- a/plugins/folder-unsubscribe/Makefile.am
+++ b/plugins/folder-unsubscribe/Makefile.am
@@ -8,6 +8,9 @@ plugin_DATA = org-gnome-mail-folder-unsubscribe.eplug
 plugin_LTLIBRARIES = liborg-gnome-mail-folder-unsubscribe.la
 
 liborg_gnome_mail_folder_unsubscribe_la_SOURCES = folder-unsubscribe.c
-liborg_gnome_mail_folder_unsubscribe_la_LDFLAGS = -module -avoid-version
+liborg_gnome_mail_folder_unsubscribe_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_mail_folder_unsubscribe_la_LIBADD =	\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST = org-gnome-mail-folder-unsubscribe.eplug.xml
diff --git a/plugins/mail-to-meeting/ChangeLog b/plugins/mail-to-meeting/ChangeLog
index 67b3092f37..d266c0cf44 100644
--- a/plugins/mail-to-meeting/ChangeLog
+++ b/plugins/mail-to-meeting/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Bharath Acharya  <abharath@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
+	dlls on Windows.
+
 2007-11-05  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #353779
diff --git a/plugins/mail-to-meeting/Makefile.am b/plugins/mail-to-meeting/Makefile.am
index 617deeac97..5596678783 100644
--- a/plugins/mail-to-meeting/Makefile.am
+++ b/plugins/mail-to-meeting/Makefile.am
@@ -8,7 +8,10 @@ plugin_DATA = org-gnome-mail-to-meeting.eplug
 plugin_LTLIBRARIES = liborg-gnome-mail-to-meeting.la
 
 liborg_gnome_mail_to_meeting_la_SOURCES = mail-to-meeting.c
-liborg_gnome_mail_to_meeting_la_LDFLAGS = -module -avoid-version
+liborg_gnome_mail_to_meeting_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_mail_to_meeting_la_LIBADD =	\
+	$(EVOLUTION_CALENDAR_LIBS)	\
+	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST = org-gnome-mail-to-meeting.eplug.xml
 
diff --git a/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog
index 8f6ec7a35e..ffa866b4d6 100644
--- a/plugins/mail-to-task/ChangeLog
+++ b/plugins/mail-to-task/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Bharath Acharya  <abharath@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
+	dlls on Windows.
+
 2008-06-18  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #318089
diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am
index 57d29acdb3..f4241c2fc3 100644
--- a/plugins/mail-to-task/Makefile.am
+++ b/plugins/mail-to-task/Makefile.am
@@ -8,7 +8,13 @@ plugin_DATA = org-gnome-mail-to-task.eplug org-gnome-mail-to-task.xml
 plugin_LTLIBRARIES = liborg-gnome-mail-to-task.la
 
 liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c
-liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version
+liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_mail_to_task_la_LIBADD =	\
+	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/calendar/common/libevolution-calendarprivate.la	\
+	$(top_builddir)/mail/libevolution-mail.la			\ 
+	$(EVOLUTION_CALENDAR_LIBS)					\
+	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST = org-gnome-mail-to-task.eplug.xml \
 	     org-gnome-mail-to-task.xml
diff --git a/plugins/mailing-list-actions/ChangeLog b/plugins/mailing-list-actions/ChangeLog
index 8241315310..8c661916bb 100644
--- a/plugins/mailing-list-actions/ChangeLog
+++ b/plugins/mailing-list-actions/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Bharath Acharya  <abharath@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
+	dlls on Windows.
+
 2008-06-02  Jacob Brown  <jeblinux@gmail.com>
 
 	** Fix for bug #529464
diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am
index 72bbd70660..7d6560d716 100644
--- a/plugins/mailing-list-actions/Makefile.am
+++ b/plugins/mailing-list-actions/Makefile.am
@@ -9,7 +9,11 @@ plugin_DATA = org-gnome-mailing-list-actions.eplug org-gnome-mailing-list-action
 plugin_LTLIBRARIES = liborg-gnome-mailing-list-actions.la
 
 liborg_gnome_mailing_list_actions_la_SOURCES = mailing-list-actions.c
-liborg_gnome_mailing_list_actions_la_LDFLAGS = -module -avoid-version
+liborg_gnome_mailing_list_actions_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_mailing_list_actions_la_LIBADD =	\
+	$(top_builddir)/e-util/libeutil.la	\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(EVOLUTION_MAIL_LIBS)
 
 error_DATA = org-gnome-mailing-list-actions.error
 errordir = $(privdatadir)/errors
diff --git a/plugins/mark-calendar-offline/ChangeLog b/plugins/mark-calendar-offline/ChangeLog
index 989a282ea2..e0c73095d6 100644
--- a/plugins/mark-calendar-offline/ChangeLog
+++ b/plugins/mark-calendar-offline/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Bharath Acharya  <abharath@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
+	dlls on Windows.
+
 2007-11-11  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
 
 	** Fix bug #495872
diff --git a/plugins/mark-calendar-offline/Makefile.am b/plugins/mark-calendar-offline/Makefile.am
index 3a4334699c..c7773ae87b 100644
--- a/plugins/mark-calendar-offline/Makefile.am
+++ b/plugins/mark-calendar-offline/Makefile.am
@@ -8,7 +8,9 @@ plugin_DATA = org-gnome-mark-calendar-offline.eplug
 plugin_LTLIBRARIES = liborg-gnome-mark-calendar-offline.la
 
 liborg_gnome_mark_calendar_offline_la_SOURCES = mark-calendar-offline.c
-liborg_gnome_mark_calendar_offline_la_LDFLAGS = -module -avoid-version
+liborg_gnome_mark_calendar_offline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_mark_calendar_offline_la_LIBADD =	\
+	$(EVOLUTION_CALENDAR_LIBS)
 
 EXTRA_DIST = org-gnome-mark-calendar-offline.eplug.xml
 
diff --git a/plugins/prefer-plain/ChangeLog b/plugins/prefer-plain/ChangeLog
index 274dde355c..7f2699a779 100644
--- a/plugins/prefer-plain/ChangeLog
+++ b/plugins/prefer-plain/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Bharath Acharya  <abharath@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
+	dlls on Windows.
+
 2008-05-27  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #532384
diff --git a/plugins/prefer-plain/Makefile.am b/plugins/prefer-plain/Makefile.am
index 00eef8ba84..ec597e4d4c 100644
--- a/plugins/prefer-plain/Makefile.am
+++ b/plugins/prefer-plain/Makefile.am
@@ -8,7 +8,10 @@ plugin_DATA = org-gnome-prefer-plain.eplug
 plugin_LTLIBRARIES = liborg-gnome-prefer-plain.la
 
 liborg_gnome_prefer_plain_la_SOURCES = prefer-plain.c
-liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version
+liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_prefer_plain_la_LIBADD =	\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST = org-gnome-prefer-plain.eplug.xml
 
diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog
index 2d84be32d4..eb418028d0 100644
--- a/plugins/save-calendar/ChangeLog
+++ b/plugins/save-calendar/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Bharath Acharya  <abharath@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
+	dlls on Windows.
+
 2008-05-22  Matthew Barnes  <mbarnes@redhat.com>
 
 	* csv-format.c (do_save_calendar_csv):
diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am
index b3c8deb280..461bf0492d 100644
--- a/plugins/save-calendar/Makefile.am
+++ b/plugins/save-calendar/Makefile.am
@@ -14,7 +14,10 @@ liborg_gnome_save_calendar_la_SOURCES = \
 	rdf-format.c			\
 	format-handler.h
 
-liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version
+liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_save_calendar_la_LIBADD =	\
+	$(top_builddir)/e-util/libeutil.la	\
+	$(EVOLUTION_CALENDAR_LIBS)
 
 EXTRA_DIST = org-gnome-save-calendar.eplug.xml
 
diff --git a/plugins/select-one-source/ChangeLog b/plugins/select-one-source/ChangeLog
index c190550d6e..abaa1aed35 100644
--- a/plugins/select-one-source/ChangeLog
+++ b/plugins/select-one-source/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Bharath Acharya  <abharath@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
+	dlls on Windows.
+
 2007-11-11  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
 
 	** Fix bug #495872
diff --git a/plugins/select-one-source/Makefile.am b/plugins/select-one-source/Makefile.am
index 2dcf45c0a0..7bd40ef4f7 100644
--- a/plugins/select-one-source/Makefile.am
+++ b/plugins/select-one-source/Makefile.am
@@ -8,7 +8,9 @@ plugin_DATA = org-gnome-select-one-source.eplug
 plugin_LTLIBRARIES = liborg-gnome-select-one-source.la
 
 liborg_gnome_select_one_source_la_SOURCES = select-one-source.c
-liborg_gnome_select_one_source_la_LDFLAGS = -module -avoid-version
+liborg_gnome_select_one_source_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_select_one_source_la_LIBADD =	\
+	$(EVOLUTION_CALENDAR_LIBS)
 
 EXTRA_DIST = org-gnome-select-one-source.eplug.xml
 
diff --git a/plugins/subject-thread/ChangeLog b/plugins/subject-thread/ChangeLog
index 3c647ab8f8..59b23f7b75 100644
--- a/plugins/subject-thread/ChangeLog
+++ b/plugins/subject-thread/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Bharath Acharya  <abharath@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
+	dlls on Windows.
+
 2007-07-29  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fix for bug #428123 from Lucky
diff --git a/plugins/subject-thread/Makefile.am b/plugins/subject-thread/Makefile.am
index 45f2a826b1..0ff0fc49a5 100644
--- a/plugins/subject-thread/Makefile.am
+++ b/plugins/subject-thread/Makefile.am
@@ -8,7 +8,9 @@ plugin_DATA = org-gnome-subject-thread.eplug
 plugin_LTLIBRARIES = liborg-gnome-subject-thread.la
 
 liborg_gnome_subject_thread_la_SOURCES = subject-thread.c
-liborg_gnome_subject_thread_la_LDFLAGS = -module -avoid-version
+liborg_gnome_subject_thread_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_subject_thread_la_LIBADD =	\
+	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST = org-gnome-subject-thread.eplug.xml
 
diff --git a/plugins/templates/ChangeLog b/plugins/templates/ChangeLog
index c559689e43..a9b5dde1fc 100644
--- a/plugins/templates/ChangeLog
+++ b/plugins/templates/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12  Bharath Acharya  <abharath@novell.com>
+
+	* Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate
+	dlls on Windows.
+
 2008-07-21  Johnny Jacob  <jjohnny@novell.com>
 
 	* templates.c: Remove unused header files.
diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am
index f43dce0992..9369c0293d 100644
--- a/plugins/templates/Makefile.am
+++ b/plugins/templates/Makefile.am
@@ -15,7 +15,11 @@ plugin_DATA = 					\
 plugin_LTLIBRARIES = liborg-gnome-templates.la
 
 liborg_gnome_templates_la_SOURCES = templates.c
-liborg_gnome_templates_la_LDFLAGS = -module -avoid-version
+liborg_gnome_templates_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_templates_la_LIBADD =	\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(top_builddir)/mail/libevolution-mail.la	\
+	$(EVOLUTION_MAIL_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = apps-evolution-template-placeholders.schemas.in