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-to-task | |
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-to-task')
-rw-r--r-- | plugins/mail-to-task/ChangeLog | 9 | ||||
-rw-r--r-- | plugins/mail-to-task/Makefile.am | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog index ad020a8f0c..f3cfe042c6 100644 --- a/plugins/mail-to-task/ChangeLog +++ b/plugins/mail-to-task/ChangeLog @@ -1,3 +1,12 @@ +2009-01-28 Tor Lillqvist <tml@novell.com> + + * Makefile.am: Remove a trailing space after the line continuation + backslash. + +2009-01-21 Milan Crha <mcrha@redhat.com> + + * Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS. + 2008-10-31 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #558726 (patch by Frederic van Starbmann) diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index f4241c2fc3..42e1e6fb65 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = \ -I$(top_srcdir) \ + $(EVOLUTION_CALENDAR_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) @EVO_PLUGIN_RULE@ @@ -12,7 +13,7 @@ liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_mail_to_task_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ - $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/mail/libevolution-mail.la \ $(EVOLUTION_CALENDAR_LIBS) \ $(EVOLUTION_MAIL_LIBS) |