evolution r37156 - trunk/plugins/pst-import

[tml svn gnome org]

Author: tml
Date: Wed Jan 28 19:35:22 2009
New Revision: 37156
URL: http://svn.gnome.org/viewvc/evolution?rev=37156&view=rev

Log:
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.



Modified:
   trunk/plugins/pst-import/ChangeLog
   trunk/plugins/pst-import/Makefile.am
   trunk/plugins/pst-import/pst-importer.c

Modified: trunk/plugins/pst-import/Makefile.am
==============================================================================
--- trunk/plugins/pst-import/Makefile.am	(original)
+++ trunk/plugins/pst-import/Makefile.am	Wed Jan 28 19:35:22 2009
@@ -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_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

Modified: trunk/plugins/pst-import/pst-importer.c
==============================================================================
--- trunk/plugins/pst-import/pst-importer.c	(original)
+++ trunk/plugins/pst-import/pst-importer.c	Wed Jan 28 19:35:22 2009
@@ -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;