Don't return a value from a void funtion.

2005-07-13  Tor Lillqvist  <tml@novell.com>

	* calendar-weather/calendar-weather.c
	(e_calendar_weather_migrate): Don't return a value from a void
	funtion.

	* groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml:
	Use SOEXT.

	* groupwise-features/Makefile.am (NO_UNDEFINED_REQUIRED_LIBS):
	As the code does use functions from libevolution-mail, link
	with it. But OK, let's do it (at build time) only on Win32,
	then.

	* mail-account-disable/Makefile.am (INCLUDES): Remove duplicated line.
	(LDFLAGS): Use NO_UNDEFINED.
	(LIBADD): Link with the required libraries, but let's do it only
	on Win32.

	* mail-account-disable/org-gnome-mail-account-disable.eplug.xml:
	Use SOEXT.

	* proxy/Makefile.am (LIBADD): Link with libeutil.

	* proxy-login/Makefile.am (LIBADD): Link with libeutil. Link with
	libevolution-mail on Win32 only. (Have I understood correctly that
	it isn't considered a good idea on Unix to link plugins at
	link-time with libevolution-mail?)

	* proxy-login/org-gnome-proxy-login.eplug.xml: Use SOEXT.

svn path=/trunk/; revision=29753

14 files changed, 62 insertions, 7 deletions

diff --git a/plugins/calendar-weather/ChangeLog b/plugins/calendar-weather/ChangeLog
index f6770e1622..eba572420f 100644
--- a/plugins/calendar-weather/ChangeLog
+++ b/plugins/calendar-weather/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-13  Tor Lillqvist  <tml@novell.com>
+
+	* calendar-weather.c (e_calendar_weather_migrate): Don't return a
+	value from a void funtion.
+
 2005-06-27  Tor Lillqvist  <tml@novell.com>
 
 	* Makefile.am: There is no EVOLUTION_CFLAGS. Use
diff --git a/plugins/calendar-weather/calendar-weather.c b/plugins/calendar-weather/calendar-weather.c
index 976c204d01..8fe917ba7f 100644
--- a/plugins/calendar-weather/calendar-weather.c
+++ b/plugins/calendar-weather/calendar-weather.c
@@ -107,7 +107,6 @@ e_calendar_weather_migrate (EPlugin *epl, ECalEventTargetComponent *data)
 		g_object_unref (weather);
 
 	e_source_list_sync (source_list, NULL);
-	return 0;
 }
 
 static void
diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog
index 55d2e49ace..424d65dc06 100644
--- a/plugins/groupwise-account-setup/ChangeLog
+++ b/plugins/groupwise-account-setup/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-13  Tor Lillqvist  <tml@novell.com>
+
+	* org-gnome-gw-account-setup.eplug.xml: Use SOEXT.
+
 2005-07-12 Vivek Jain <jvivek@novell.com>
 	
 	* Makefile.am: included missing header file
diff --git a/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml b/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
index f2bfda5153..1c044b9c7d 100644
--- a/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
+++ b/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <e-plugin-list>
   <e-plugin id="org.gnome.evolution.plugin.gw-account-setup" type="shlib" _name="Groupwise Account Setup"
-    location="@PLUGINDIR@/liborg-gnome-gw-account-setup.so" load-on-startup="true">
+    location="@PLUGINDIR@/liborg-gnome-gw-account-setup@SOEXT@" load-on-startup="true">
     <author name="Sivaiah Nallagatla" email="snallagatla@novell.com"/>
     <description>A plugin to setup groupwise calendar and contacts sources.</description>
     
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index b3557715b9..d13f88a5f8 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-13  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am (NO_UNDEFINED_REQUIRED_LIBS): As the code does use
+	functions from libevolution-mail, link with it. But OK, let's do
+	it (at build time) only on Win32, then.
+
 2005-07-12  Vivek Jain <jvivek@novell.com>
 	
 	transferred ChangeLog entry here
diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am
index 4ada16e967..0c0941db18 100644
--- a/plugins/groupwise-features/Makefile.am
+++ b/plugins/groupwise-features/Makefile.am
@@ -1,3 +1,7 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la
+endif
+
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
@@ -32,6 +36,7 @@ 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/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">
diff --git a/plugins/proxy-login/ChangeLog b/plugins/proxy-login/ChangeLog
index d77bfcf292..0209a0bbcb 100644
--- a/plugins/proxy-login/ChangeLog
+++ b/plugins/proxy-login/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-13  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am (LIBADD): Link with libeutil. Link with
+	libevolution-mail on Win32 only. (Have I understood correctly that
+	it isn't considered a good idea on Unix to link plugins at
+	link-time with libevolution-mail?)
+
+	* org-gnome-proxy-login.eplug.xml: Use SOEXT.
+
 2005-07-12  Sankar P  <psankar@novell.com>
 
 	* Makefile.am :
diff --git a/plugins/proxy-login/Makefile.am b/plugins/proxy-login/Makefile.am
index e0ef4ae1b3..b63a2d6b7e 100644
--- a/plugins/proxy-login/Makefile.am
+++ b/plugins/proxy-login/Makefile.am
@@ -15,7 +15,13 @@ plugin_LTLIBRARIES = libproxy-login.la
 libproxy_login_la_SOURCES = proxy-login.c proxy-login.h
 libproxy_login_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la
+endif
+
 libproxy_login_la_LIBADD =				\
+		$(top_builddir)/e-util/libeutil.la	\
+		$(NO_UNDEFINED_REQUIRED_LIBS)		\
 		$(EVOLUTION_MAIL_LIBS)			\
 		$(CAMEL_GROUPWISE_LIBS)
 
diff --git a/plugins/proxy-login/org-gnome-proxy-login.eplug.xml b/plugins/proxy-login/org-gnome-proxy-login.eplug.xml
index 20c8a1907f..ba6e2adf02 100644
--- a/plugins/proxy-login/org-gnome-proxy-login.eplug.xml
+++ b/plugins/proxy-login/org-gnome-proxy-login.eplug.xml
@@ -2,7 +2,7 @@
 <e-plugin-list>
   <e-plugin id="org.gnome.proxy.login" 
    type="shlib" domain="evolution" _name="Disable Account"
-   location="@PLUGINDIR@/libproxy-login.so">
+   location="@PLUGINDIR@/libproxy-login@SOEXT@">
     <_description>Allows disabling of accounts.</_description>
     <author name="Shreyas Srinivasan" email="sshreyas@novell.com"/>
     <hook class="org.gnome.evolution.mail.popup:1.0">
diff --git a/plugins/proxy/ChangeLog b/plugins/proxy/ChangeLog
index 2625623db8..34edb99542 100644
--- a/plugins/proxy/ChangeLog
+++ b/plugins/proxy/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-13  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am (LIBADD): Link with libeutil.
+
 2005-07-12  Sankar P  <psankar@novell.com>
 
 	* Makefile.am :
diff --git a/plugins/proxy/Makefile.am b/plugins/proxy/Makefile.am
index 6a72207000..11bc02b96d 100644
--- a/plugins/proxy/Makefile.am
+++ b/plugins/proxy/Makefile.am
@@ -15,6 +15,7 @@ plugin_LTLIBRARIES = liborg-gnome-proxy.la
 liborg_gnome_proxy_la_SOURCES = proxy.c proxy.h
 liborg_gnome_proxy_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_proxy_la_LIBADD =				\
+	$(top_builddir)/e-util/libeutil.la		\
 	$(EVOLUTION_MAIL_LIBS)				\
 	$(CAMEL_GROUPWISE_LIBS)
 
@@ -31,6 +32,6 @@ EXTRA_DIST = 					\
 		$(error_DATA)			\
 		$(glade_DATA) 			\
 		org-gnome-proxy.eplug.xml	\
-      		org-gnome-proxy-errors.xml	
+		org-gnome-proxy-errors.xml	
 
 CLEANFILES = $(BUILT_SOURCES)