From fee5916b60c605ff5086d8fdc2a85c5ea21351f6 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Sat, 31 Jan 2009 19:03:12 +0000
Subject: Merge revisions 37108:37199 from trunk.

svn path=/branches/kill-bonobo/; revision=37200
---
 plugins/pst-import/ChangeLog      | 13 +++++++++++++
 plugins/pst-import/Makefile.am    | 17 ++++++++++++++---
 plugins/pst-import/pst-importer.c |  2 +-
 3 files changed, 28 insertions(+), 4 deletions(-)

(limited to 'plugins/pst-import')

diff --git a/plugins/pst-import/ChangeLog b/plugins/pst-import/ChangeLog
index ca115fa827..0f031b508d 100644
--- a/plugins/pst-import/ChangeLog
+++ b/plugins/pst-import/ChangeLog
@@ -1,3 +1,16 @@
+2009-01-28  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: On Windows use -no-undefined and link with all
+	required libraries. (Just throw in a bunch of libraries without
+	cherry-picking. Having "superfluous" ones just slows down the
+	linking a bit, but doesn't hurt at run-time.)
+
+	Use LIBPST_CFLAGS.
+
+	* pst-importer.c: Include <libpst/define.h> before the other
+	libpst headers. Otherwise we get compilation errors on Windows,
+	sigh.
+
 2009-01-15  Bharath Acharya  <abharath@novell.com>
 
 	Basic functionality implemented by 
diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am
index 031b1b181e..9f3061e241 100644
--- a/plugins/pst-import/Makefile.am
+++ b/plugins/pst-import/Makefile.am
@@ -1,10 +1,19 @@
+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)					\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
 	-DLOCALEDIR="\"$(LOCALEDIR)\""			\
 	$(EVOLUTION_CFLAGS)				\
-	$(EVOLUTION_MAIL_CFLAGS)			
+	$(EVOLUTION_MAIL_CFLAGS)			\
+	$(LIBPST_CFLAGS)
 
 @EVO_PLUGIN_RULE@
 
@@ -12,8 +21,10 @@ plugin_DATA = org-gnome-pst-import.eplug
 plugin_LTLIBRARIES = liborg-gnome-pst-import.la
 
 liborg_gnome_pst_import_la_SOURCES = pst-importer.c
-liborg_gnome_pst_import_la_LDFLAGS = -module -avoid-version
-liborg_gnome_pst_import_la_LIBADD = \
+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/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index acd84c1a67..8cbf80eb50 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -66,8 +66,8 @@
 #include <mail/mail-tools.h>
 #include <mail/em-utils.h>
 
-#include <libpst/libpst.h>
 #include <libpst/define.h>
+#include <libpst/libpst.h>
 #include <libpst/timeconv.h>
 
 typedef struct _PstImporter PstImporter;
-- 
cgit v1.2.3