From 6ae40bce3032f0ca141640cfa14b7d6e4d015948 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@novell.com>
Date: Wed, 28 Jan 2009 17:35:12 +0000
Subject: Use -no-undefined and link with more libraries on Windows.

2009-01-28  Tor Lillqvist  <tml@novell.com>

	* Makefile.am: Use -no-undefined and link with more libraries on
	Windows.

	* tnef-plugin.c: Remove unused <sys/wait.h>.


svn path=/trunk/; revision=37153
---
 plugins/tnef-attachments/ChangeLog     |  7 +++++++
 plugins/tnef-attachments/Makefile.am   | 13 ++++++++++++-
 plugins/tnef-attachments/tnef-plugin.c |  1 -
 3 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'plugins/tnef-attachments')

diff --git a/plugins/tnef-attachments/ChangeLog b/plugins/tnef-attachments/ChangeLog
index 6c2f54a396..b90faf0bf8 100644
--- a/plugins/tnef-attachments/ChangeLog
+++ b/plugins/tnef-attachments/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-28  Tor Lillqvist  <tml@novell.com>
+
+	* Makefile.am: Use -no-undefined and link with more libraries on
+	Windows.
+
+	* tnef-plugin.c: Remove unused <sys/wait.h>.
+
 2008-09-24  Philip Withnall  <philip@tecnocode.co.uk>
 
 	** Fixes bug #553479
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index 7f52413306..809d1ed1f4 100644
--- a/plugins/tnef-attachments/Makefile.am
+++ b/plugins/tnef-attachments/Makefile.am
@@ -1,3 +1,11 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS = 				\
+	$(EVOLUTION_MAIL_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)				\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(top_builddir)/mail/libevolution-mail.la
+endif
+
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
@@ -11,7 +19,10 @@ plugin_DATA = org-gnome-tnef-attachments.eplug
 plugin_LTLIBRARIES = liborg-gnome-tnef-attachments.la
 
 liborg_gnome_tnef_attachments_la_SOURCES = tnef-plugin.c
-liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version -lytnef
+liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version  $(NO_UNDEFINED)
+liborg_gnome_tnef_attachments_la_LIBADD = 		\
+	$(NO_UNDEFINED_REQUIRED_LIBS)			\
+	-lytnef
 
 EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml
 
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index e7b5d624eb..f0152862f3 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -31,7 +31,6 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <stdlib.h>
-- 
cgit v1.2.3