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/mail-notification | |
| 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/mail-notification')
| -rw-r--r-- | plugins/mail-notification/ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/mail-notification/Makefile.am | 13 |
2 files changed, 16 insertions, 2 deletions
diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog index 96c5abc9e4..ecbc34391d 100644 --- a/plugins/mail-notification/ChangeLog +++ b/plugins/mail-notification/ChangeLog @@ -1,3 +1,8 @@ +2009-01-28 Tor Lillqvist <tml@novell.com> + + * Makefile.am: Use -no-undefined and link with more libraries on + Windows. + 2008-11-19 Srinivasa Ragavan <sragavan@novell.com> * mail-notification.c: Fix compilation error. diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index 80b4fbcc98..8915fe92ad 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -1,3 +1,10 @@ +if OS_WIN32 +NO_UNDEFINED_REQUIRED_LIBS = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/e-util/libeutil.la \ + $(GNOME_PLATFORM_LIBS) +endif + INCLUDES = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) \ @@ -16,8 +23,10 @@ plugin_LTLIBRARIES = liborg-gnome-mail-notification.la liborg_gnome_mail_notification_la_SOURCES = mail-notification.c liborg_gnome_mail_notification_la_LDFLAGS = \ - -module -avoid-version \ - $(LIBNOTIFY_LIBS) + -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_mail_notification_la_LIBADD = \ + $(LIBNOTIFY_LIBS) \ + $(NO_UNDEFINED_REQUIRED_LIBS) if ENABLE_DBUS liborg_gnome_mail_notification_la_LDFLAGS += $(NMN_LIBS) |