diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-01 03:03:12 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-01 03:03:12 +0800 |
| commit | fee5916b60c605ff5086d8fdc2a85c5ea21351f6 (patch) | |
| tree | 4feaede1cf070448a32bd0ab846908e47747ceb7 /plugins/tnef-attachments | |
| parent | cd5ff486fb02451645f8b4b39608edca2da5e4a2 (diff) | |
| download | gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.gz gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.bz2 gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.lz gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.xz gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.zst gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.zip | |
Merge revisions 37108:37199 from trunk.
svn path=/branches/kill-bonobo/; revision=37200
Diffstat (limited to 'plugins/tnef-attachments')
| -rw-r--r-- | plugins/tnef-attachments/ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/tnef-attachments/Makefile.am | 13 | ||||
| -rw-r--r-- | plugins/tnef-attachments/tnef-plugin.c | 1 |
3 files changed, 19 insertions, 2 deletions
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> |