diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-02-27 02:23:33 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-27 02:23:33 +0800 |
| commit | 43622cd610f04b6afda86b25645e4a8f62117637 (patch) | |
| tree | 93df44fcc56ce66e642ee46fe4022a6354e48d04 | |
| parent | 307d428797bd915bd4f91a5cef560ee475da213c (diff) | |
| download | gsoc2013-evolution-43622cd610f04b6afda86b25645e4a8f62117637.tar.gz gsoc2013-evolution-43622cd610f04b6afda86b25645e4a8f62117637.tar.zst gsoc2013-evolution-43622cd610f04b6afda86b25645e4a8f62117637.zip | |
** Fixes bug #572950
2009-02-26 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #572950
* plugins/caldav/Makefile.am:
* plugins/google-account-setup/Makefile.am:
* plugins/webdav-account-setup/Makefile.am:
Fix ordering of -I compiler directives. Patch by Daniel Macks.
* addressbook/printing/Makefile.am:
Remove meaningless GNOME_INCLUDEDIR.
svn path=/trunk/; revision=37343
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/printing/Makefile.am | 1 | ||||
| -rw-r--r-- | plugins/caldav/ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/caldav/Makefile.am | 4 | ||||
| -rw-r--r-- | plugins/google-account-setup/ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/google-account-setup/Makefile.am | 6 | ||||
| -rw-r--r-- | plugins/webdav-account-setup/ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/webdav-account-setup/Makefile.am | 6 |
8 files changed, 36 insertions, 9 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index f39b8acf5b..78b54abb78 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2009-02-26 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #572950 + + * printing/Makefile.am: + Remove meaningless GNOME_INCLUDEDIR. Patch by Daniel Macks. + 2009-02-24 Philip Withnall <philip@tecnocode.co.uk> ** Fix for bug #572903 diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am index a2c3bec2fe..12be8759d4 100644 --- a/addressbook/printing/Makefile.am +++ b/addressbook/printing/Makefile.am @@ -8,7 +8,6 @@ glade_DATA = \ e-contact-print.glade INCLUDES = \ - $(GNOME_INCLUDEDIR) \ -DG_LOG_DOMAIN=\"addressbook-printing\" \ -I$(top_srcdir)/addressbook \ -I$(top_srcdir)/addressbook/backend \ diff --git a/plugins/caldav/ChangeLog b/plugins/caldav/ChangeLog index 8236b8f2e2..256dc030fc 100644 --- a/plugins/caldav/ChangeLog +++ b/plugins/caldav/ChangeLog @@ -1,3 +1,10 @@ +2009-02-26 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #572950 + + * Makefile.am: + Fix ordering of -I compiler directives. Patch by Daniel Macks. + 2008-12-08 Milan Crha <mcrha@redhat.com> ** Fix for bug #562990 diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am index b43ceebcd4..d812af7540 100644 --- a/plugins/caldav/Makefile.am +++ b/plugins/caldav/Makefile.am @@ -1,8 +1,8 @@ INCLUDES = \ - $(EVOLUTION_CALENDAR_CFLAGS) \ -I . \ -I$(top_srcdir) \ - -DCALDAV_GLADEDIR=\""$(gladedir)"\" + -DCALDAV_GLADEDIR=\""$(gladedir)"\" \ + $(EVOLUTION_CALENDAR_CFLAGS) @EVO_PLUGIN_RULE@ diff --git a/plugins/google-account-setup/ChangeLog b/plugins/google-account-setup/ChangeLog index 9842a40603..5ac1d69ef3 100644 --- a/plugins/google-account-setup/ChangeLog +++ b/plugins/google-account-setup/ChangeLog @@ -1,3 +1,10 @@ +2009-02-26 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #572950 + + * Makefile.am: + Fix ordering of -I compiler directives. Patch by Daniel Macks. + 2009-02-25 Milan Crha <mcrha@redhat.com> ** Part of fix for bug #559719 diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am index d1c385b172..0d39004593 100644 --- a/plugins/google-account-setup/Makefile.am +++ b/plugins/google-account-setup/Makefile.am @@ -1,9 +1,9 @@ INCLUDES = \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ -I . \ -I$(top_srcdir) \ - -DCALDAV_GLADEDIR=\""$(gladedir)"\" + -DCALDAV_GLADEDIR=\""$(gladedir)"\" \ + $(EVOLUTION_CALENDAR_CFLAGS) \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) @EVO_PLUGIN_RULE@ diff --git a/plugins/webdav-account-setup/ChangeLog b/plugins/webdav-account-setup/ChangeLog index 512d6a1318..354371cc6a 100644 --- a/plugins/webdav-account-setup/ChangeLog +++ b/plugins/webdav-account-setup/ChangeLog @@ -1,3 +1,10 @@ +2009-02-26 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #572950 + + * Makefile.am: + Fix ordering of -I compiler directives. Patch by Daniel Macks. + 2009-02-25 Milan Crha <mcrha@redhat.com> ** Part of fix for bug #559719 diff --git a/plugins/webdav-account-setup/Makefile.am b/plugins/webdav-account-setup/Makefile.am index 5637f76e66..a979ed08e5 100644 --- a/plugins/webdav-account-setup/Makefile.am +++ b/plugins/webdav-account-setup/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - -I . \ - -I$(top_srcdir) + -I . \ + -I$(top_srcdir) \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) @EVO_PLUGIN_RULE@ |