aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mail-account-disable
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/mail-account-disable')
-rw-r--r--plugins/mail-account-disable/ChangeLog9
-rw-r--r--plugins/mail-account-disable/Makefile.am11
-rw-r--r--plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml2
3 files changed, 19 insertions, 3 deletions
diff --git a/plugins/mail-account-disable/ChangeLog b/plugins/mail-account-disable/ChangeLog
index 7ab7fa0e35..ef98d8cfd2 100644
--- a/plugins/mail-account-disable/ChangeLog
+++ b/plugins/mail-account-disable/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-13 Tor Lillqvist <tml@novell.com>
+
+ * Makefile.am (INCLUDES): Remove duplicated line.
+ (LDFLAGS): Use NO_UNDEFINED.
+ (LIBADD): Link with the required libraries, but let's do it only
+ on Win32.
+
+ * org-gnome-mail-account-disable.eplug.xml: Use SOEXT.
+
2005-07-12 Vivek Jain <jvivek@novell.com>
have a ChangeLog and transfer the changelog entry from the main
diff --git a/plugins/mail-account-disable/Makefile.am b/plugins/mail-account-disable/Makefile.am
index 9cb5f390ac..b1bae11247 100644
--- a/plugins/mail-account-disable/Makefile.am
+++ b/plugins/mail-account-disable/Makefile.am
@@ -1,7 +1,13 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS = \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/mail/libevolution-mail.la \
+ $(EVOLUTION_MAIL_LIBS)
+endif
+
INCLUDES = \
-I$(top_srcdir) \
$(EVOLUTION_MAIL_CFLAGS) \
- $(EVOLUTION_MAIL_CFLAGS) \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
@EVO_PLUGIN_RULE@
@@ -10,6 +16,7 @@ plugin_DATA = org-gnome-mail-account-disable.eplug
plugin_LTLIBRARIES = libmail-account-disable.la
libmail_account_disable_la_SOURCES = mail-account-disable.c
-libmail_account_disable_la_LDFLAGS = -module -avoid-version
+libmail_account_disable_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+libmail_account_disable_la_LIBADD = $(NO_UNDEFINED_REQUIRED_LIBS)
EXTRA_DIST = org-gnome-mail-account-disable.eplug.xml
diff --git a/plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml b/plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
index a21bfaabf3..82e587c5e9 100644
--- a/plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
+++ b/plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
@@ -2,7 +2,7 @@
<e-plugin-list>
<e-plugin id="org.gnome.mail.account.disable"
type="shlib" domain="evolution" _name="Disable Account"
- location="@PLUGINDIR@/libmail-account-disable.so">
+ location="@PLUGINDIR@/libmail-account-disable@SOEXT@">
<_description>Allows disabling of accounts.</_description>
<author name="Shreyas Srinivasan" email="sshreyas@novell.com"/>
<hook class="org.gnome.evolution.mail.popup:1.0">