evolution r37153 - trunk/plugins/tnef-attachments

[tml svn gnome org]

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

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



Modified:
   trunk/plugins/tnef-attachments/ChangeLog
   trunk/plugins/tnef-attachments/Makefile.am
   trunk/plugins/tnef-attachments/tnef-plugin.c

Modified: trunk/plugins/tnef-attachments/Makefile.am
==============================================================================
--- trunk/plugins/tnef-attachments/Makefile.am	(original)
+++ trunk/plugins/tnef-attachments/Makefile.am	Wed Jan 28 17:35:12 2009
@@ -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_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
 

Modified: trunk/plugins/tnef-attachments/tnef-plugin.c
==============================================================================
--- trunk/plugins/tnef-attachments/tnef-plugin.c	(original)
+++ trunk/plugins/tnef-attachments/tnef-plugin.c	Wed Jan 28 17:35:12 2009
@@ -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>