diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-01 06:34:08 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-01 06:34:08 +0800 |
| commit | bfc5ba2511dc5fd9f5aa9868946c8860afad81bf (patch) | |
| tree | 42c8edf720cd7a80c448da74f080ca1d6b80d56c /plugins | |
| parent | 8dc6bbd250891bcef9130a789c9b74a01be7f1cb (diff) | |
| download | gsoc2013-evolution-bfc5ba2511dc5fd9f5aa9868946c8860afad81bf.tar gsoc2013-evolution-bfc5ba2511dc5fd9f5aa9868946c8860afad81bf.tar.gz gsoc2013-evolution-bfc5ba2511dc5fd9f5aa9868946c8860afad81bf.tar.bz2 gsoc2013-evolution-bfc5ba2511dc5fd9f5aa9868946c8860afad81bf.tar.lz gsoc2013-evolution-bfc5ba2511dc5fd9f5aa9868946c8860afad81bf.tar.xz gsoc2013-evolution-bfc5ba2511dc5fd9f5aa9868946c8860afad81bf.tar.zst gsoc2013-evolution-bfc5ba2511dc5fd9f5aa9868946c8860afad81bf.zip | |
Fix "make distcheck" errors and other build cleanups.
Diffstat (limited to 'plugins')
44 files changed, 44 insertions, 45 deletions
diff --git a/plugins/addressbook-file/Makefile.am b/plugins/addressbook-file/Makefile.am index b195514b66..013e453635 100644 --- a/plugins/addressbook-file/Makefile.am +++ b/plugins/addressbook-file/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am index b3c1799455..8fb3c30ad2 100644 --- a/plugins/attachment-reminder/Makefile.am +++ b/plugins/attachment-reminder/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir)/composer \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am index a8f591ec1f..0437d0471d 100644 --- a/plugins/audio-inline/Makefile.am +++ b/plugins/audio-inline/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) \ $(GSTREAMER_CFLAGS) diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am index 1db60cd625..c1792abb64 100644 --- a/plugins/backup-restore/Makefile.am +++ b/plugins/backup-restore/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ -DPREFIX=\""$(prefix)"\" \ diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am index ac42633ed6..51811eaaf9 100644 --- a/plugins/bbdb/Makefile.am +++ b/plugins/bbdb/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir)/composer \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am index 9d51b4d89d..00453ef090 100644 --- a/plugins/bogo-junk-plugin/Makefile.am +++ b/plugins/bogo-junk-plugin/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am index cb18c5b0be..243338e243 100644 --- a/plugins/caldav/Makefile.am +++ b/plugins/caldav/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I . \ -I$(top_srcdir) \ -DCALDAV_GLADEDIR=\""$(gladedir)"\" \ diff --git a/plugins/calendar-file/Makefile.am b/plugins/calendar-file/Makefile.am index 7d40192c6f..aadb4b5927 100644 --- a/plugins/calendar-file/Makefile.am +++ b/plugins/calendar-file/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(SOURCE_SEL_CFLAGS) diff --git a/plugins/calendar-http/Makefile.am b/plugins/calendar-http/Makefile.am index 4edd28c8a0..89c17be4af 100644 --- a/plugins/calendar-http/Makefile.am +++ b/plugins/calendar-http/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(SOURCE_SEL_CFLAGS) diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am index 4404dedcde..8ba5fdf2cd 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -1,6 +1,6 @@ eds_datadir = `pkg-config --variable=privdatadir evolution-data-server-1.2` -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir)/shell \ $(EVOLUTION_CALENDAR_CFLAGS) \ diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am index d54107f973..ccb8071a99 100644 --- a/plugins/default-mailer/Makefile.am +++ b/plugins/default-mailer/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/default-source/Makefile.am b/plugins/default-source/Makefile.am index 235f615251..dda1edfa9a 100644 --- a/plugins/default-source/Makefile.am +++ b/plugins/default-source/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index c9467fe925..2ab28fad67 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I. \ +AM_CPPFLAGS = -I. \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ diff --git a/plugins/exchange-operations/Makefile.am b/plugins/exchange-operations/Makefile.am index 2e4a825771..933da521a1 100644 --- a/plugins/exchange-operations/Makefile.am +++ b/plugins/exchange-operations/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I . \ +AM_CPPFLAGS = -I . \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/calendar \ diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index b5ec612403..c05b22a3c5 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ -DPREFIX=\""$(prefix)"\" \ diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index 6ac6dd9850..07cbb8199d 100644 --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I. \ +AM_CPPFLAGS = -I. \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am index d8153a9c5b..ed452c0bc7 100644 --- a/plugins/google-account-setup/Makefile.am +++ b/plugins/google-account-setup/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I . \ -I$(top_srcdir) \ -DCALDAV_GLADEDIR=\""$(gladedir)"\" \ diff --git a/plugins/groupwise-account-setup/Makefile.am b/plugins/groupwise-account-setup/Makefile.am index 9770782d69..ddf3161f8b 100644 --- a/plugins/groupwise-account-setup/Makefile.am +++ b/plugins/groupwise-account-setup/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am index 57b37fd522..3bab9f6596 100644 --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ diff --git a/plugins/hula-account-setup/Makefile.am b/plugins/hula-account-setup/Makefile.am index 205a3a7d30..e0d89ce407 100644 --- a/plugins/hula-account-setup/Makefile.am +++ b/plugins/hula-account-setup/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am index e6b6559c63..a090848cad 100644 --- a/plugins/imap-features/Makefile.am +++ b/plugins/imap-features/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/mail \ $(EVOLUTION_MAIL_CFLAGS) \ diff --git a/plugins/ipod-sync/Makefile.am b/plugins/ipod-sync/Makefile.am index 218dd933dd..b19fcff84b 100644 --- a/plugins/ipod-sync/Makefile.am +++ b/plugins/ipod-sync/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_CALENDAR_CFLAGS) \ -DDBUS_API_SUBJECT_TO_CHANGE diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am index cbbc061833..80b70cc6c9 100644 --- a/plugins/itip-formatter/Makefile.am +++ b/plugins/itip-formatter/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index 2055cce572..62e8f72320 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -1,11 +1,11 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(EVOLUTION_MAIL_CFLAGS) \ $(LIBNOTIFY_CFLAGS) if ENABLE_DBUS -INCLUDES += -DDBUS_API_SUBJECT_TO_CHANGE=1 \ +AM_CPPFLAGS += -DDBUS_API_SUBJECT_TO_CHANGE=1 \ -DFOUND_DBUS_VERSION=$(FOUND_DBUS_VERSION) \ $(NMN_CFLAGS) endif diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index 4c7db0682c..b7eb5ed749 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(EVOLUTION_CALENDAR_CFLAGS) \ diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 49b67a528a..3613694985 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -49,7 +49,6 @@ #include <mail/em-menu.h> #include <mail/em-popup.h> #include <mail/em-utils.h> -#include <mail/em-folder-view.h> #include <mail/em-format-html.h> #include <mail/mail-config.h> #include <e-util/e-account-utils.h> diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am index e90c608a5b..80dc122e40 100644 --- a/plugins/mailing-list-actions/Makefile.am +++ b/plugins/mailing-list-actions/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir)/composer \ diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am index f1bbbcbb18..c44c5dc0cb 100644 --- a/plugins/mark-all-read/Makefile.am +++ b/plugins/mark-all-read/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)\ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/mono/Makefile.am b/plugins/mono/Makefile.am index 6404920982..4f7a935179 100644 --- a/plugins/mono/Makefile.am +++ b/plugins/mono/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(E_UTIL_CFLAGS) \ $(MONO_CFLAGS) diff --git a/plugins/plugin-manager/Makefile.am b/plugins/plugin-manager/Makefile.am index ab3c2ceb98..bd284c659c 100644 --- a/plugins/plugin-manager/Makefile.am +++ b/plugins/plugin-manager/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/prefer-plain/Makefile.am b/plugins/prefer-plain/Makefile.am index 37a49a38e7..baee242074 100644 --- a/plugins/prefer-plain/Makefile.am +++ b/plugins/prefer-plain/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/profiler/Makefile.am b/plugins/profiler/Makefile.am index 4a8a45910b..21f63af33f 100644 --- a/plugins/profiler/Makefile.am +++ b/plugins/profiler/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(SHELL_CFLAGS) diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am index b4b4f482aa..8720e252df 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(EVOLUTION_SOURCE) \ -I$(top_srcdir) \ -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \ diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am index c8119f48bb..274c14f290 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir)/shell \ diff --git a/plugins/python/Makefile.am b/plugins/python/Makefile.am index 51cc65dcc2..6f62036a1d 100644 --- a/plugins/python/Makefile.am +++ b/plugins/python/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(E_UTIL_CFLAGS) \ $(PY_INCLUDES) diff --git a/plugins/python/example/Makefile.am b/plugins/python/example/Makefile.am index a57ed573c1..cc14dc94d9 100644 --- a/plugins/python/example/Makefile.am +++ b/plugins/python/example/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" diff --git a/plugins/sa-junk-plugin/Makefile.am b/plugins/sa-junk-plugin/Makefile.am index d7ba3e7d51..66e31a0d6b 100644 --- a/plugins/sa-junk-plugin/Makefile.am +++ b/plugins/sa-junk-plugin/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am index 8336dd12ec..1ed1654350 100644 --- a/plugins/save-calendar/Makefile.am +++ b/plugins/save-calendar/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(EVOLUTION_CALENDAR_CFLAGS) diff --git a/plugins/startup-wizard/Makefile.am b/plugins/startup-wizard/Makefile.am index fc91ab3f1f..5dec1f86a5 100644 --- a/plugins/startup-wizard/Makefile.am +++ b/plugins/startup-wizard/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I . \ +AM_CPPFLAGS = -I . \ -I$(top_srcdir) \ -I$(top_builddir)/shell \ $(EVOLUTION_CALENDAR_CFLAGS) \ diff --git a/plugins/subject-thread/Makefile.am b/plugins/subject-thread/Makefile.am index 751e0eee15..e27b08bfbe 100644 --- a/plugins/subject-thread/Makefile.am +++ b/plugins/subject-thread/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index 3c1ff2052e..b2be91f2ed 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir) \ diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am index b0d4a8a678..262096ee87 100644 --- a/plugins/tnef-attachments/Makefile.am +++ b/plugins/tnef-attachments/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \ diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am index df143ce9d4..e26b46879b 100644 --- a/plugins/vcard-inline/Makefile.am +++ b/plugins/vcard-inline/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/webdav-account-setup/Makefile.am b/plugins/webdav-account-setup/Makefile.am index c143b8f667..761cd69363 100644 --- a/plugins/webdav-account-setup/Makefile.am +++ b/plugins/webdav-account-setup/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I . \ -I$(top_srcdir) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) |