diff options
89 files changed, 90 insertions, 90 deletions
diff --git a/a11y/Makefile.am b/a11y/Makefile.am index 0ccbe4390e..72cd2c72a9 100644 --- a/a11y/Makefile.am +++ b/a11y/Makefile.am @@ -13,7 +13,7 @@ endif privsolib_LTLIBRARIES = libevolution-a11y.la -INCLUDES = \ +AM_CPPFLAGS = \ $(A11Y_CFLAGS) libevolution_a11y_la_SOURCES = \ diff --git a/a11y/addressbook/Makefile.am b/a11y/addressbook/Makefile.am index 81092822f4..4d127601c3 100644 --- a/a11y/addressbook/Makefile.am +++ b/a11y/addressbook/Makefile.am @@ -6,7 +6,7 @@ endif privsolib_LTLIBRARIES = libevolution-addressbook-a11y.la -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-a11y\" \ -I$(top_srcdir) \ -I$(top_srcdir)/a11y \ diff --git a/a11y/calendar/Makefile.am b/a11y/calendar/Makefile.am index 1bd53787c9..4605cb0a63 100644 --- a/a11y/calendar/Makefile.am +++ b/a11y/calendar/Makefile.am @@ -11,7 +11,7 @@ endif privsolib_LTLIBRARIES = libevolution-calendar-a11y.la -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-a11y\" \ -I$(top_srcdir) \ -I$(top_srcdir)/calendar/gui \ diff --git a/a11y/e-table/Makefile.am b/a11y/e-table/Makefile.am index 413a37d97e..2a8d0cb072 100644 --- a/a11y/e-table/Makefile.am +++ b/a11y/e-table/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(E_UTIL_CFLAGS) \ diff --git a/a11y/e-text/Makefile.am b/a11y/e-text/Makefile.am index 069284a617..726b15157c 100644 --- a/a11y/e-text/Makefile.am +++ b/a11y/e-text/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(GNOME_PLATFORM_CFLAGS) \ diff --git a/a11y/widgets/Makefile.am b/a11y/widgets/Makefile.am index e822094500..663159c7b2 100644 --- a/a11y/widgets/Makefile.am +++ b/a11y/widgets/Makefile.am @@ -8,7 +8,7 @@ endif privsolib_LTLIBRARIES = libevolution-widgets-a11y.la -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-a11y\" \ -I$(top_srcdir) \ -I$(top_srcdir)/a11y \ diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am index de18057981..2b02156274 100644 --- a/addressbook/conduit/Makefile.am +++ b/addressbook/conduit/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/e-util \ -I$(top_builddir)/e-util \ -I$(top_srcdir)/widgets/misc \ diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 3a0732a995..6e43acd60c 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -2,7 +2,7 @@ if OS_WIN32 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-mail-shared.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-addressbook\" \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index 53ed96fdee..36ba4c90a8 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -2,7 +2,7 @@ if OS_WIN32 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/addressbook/ \ diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 8e287f3f3a..81aa679c07 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -2,7 +2,7 @@ if OS_WIN32 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/addressbook/ \ diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am index ebec465d16..fd13c9779e 100644 --- a/addressbook/gui/merging/Makefile.am +++ b/addressbook/gui/merging/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"eab-contact-merging\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -I$(top_srcdir) \ diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index ebdf49ef40..dd4bacf276 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -1,7 +1,7 @@ ruledir = $(privdatadir) rule_DATA = addresstypes.xml -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"eab-widgets\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am index 2d5b0e50ca..27c463b7b3 100644 --- a/addressbook/importers/Makefile.am +++ b/addressbook/importers/Makefile.am @@ -2,7 +2,7 @@ privsolib_LTLIBRARIES = \ libevolution-addressbook-importers.la -INCLUDES = \ +AM_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\" \ -DG_LOG_DOMAIN=\"Evolution-Importer\" \ diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am index f3090d6a09..5304e21c01 100644 --- a/addressbook/printing/Makefile.am +++ b/addressbook/printing/Makefile.am @@ -4,7 +4,7 @@ ecps_DATA = \ medbook.ecps \ phonelist.ecps -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"addressbook-printing\" \ -I$(top_srcdir)/addressbook \ -I$(top_srcdir) \ diff --git a/addressbook/tools/Makefile.am b/addressbook/tools/Makefile.am index ea1dc3867b..4444d018f8 100644 --- a/addressbook/tools/Makefile.am +++ b/addressbook/tools/Makefile.am @@ -5,7 +5,7 @@ privlibexec_SCRIPTS = \ privlibexec_PROGRAMS = \ evolution-addressbook-export -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-addressbook-tools\" \ -I$(top_srcdir) \ -I$(top_builddir) \ diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index ce5d6c35d7..42f160ea5f 100644 --- a/addressbook/util/Makefile.am +++ b/addressbook/util/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DPREFIX=\"$(prefix)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DDATADIR=\"$(datadir)\" \ diff --git a/calendar/common/Makefile.am b/calendar/common/Makefile.am index b8c5d181fb..af2b8e8a5a 100644 --- a/calendar/common/Makefile.am +++ b/calendar/common/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libevolution-calendarprivate.la -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"calendar-gui\" \ -I$(top_builddir)/shell \ -I$(top_srcdir)/shell \ diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am index 4a957633e7..c3eca002a3 100644 --- a/calendar/conduits/calendar/Makefile.am +++ b/calendar/conduits/calendar/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/e-util \ -I$(top_builddir)/e-util \ -I$(top_srcdir)/widgets/misc \ diff --git a/calendar/conduits/common/Makefile.am b/calendar/conduits/common/Makefile.am index 59e4b5aa1f..457d4eb77d 100644 --- a/calendar/conduits/common/Makefile.am +++ b/calendar/conduits/common/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/e-util \ -I$(top_builddir)/e-util \ diff --git a/calendar/conduits/memo/Makefile.am b/calendar/conduits/memo/Makefile.am index 01a04579f7..b8502cba89 100644 --- a/calendar/conduits/memo/Makefile.am +++ b/calendar/conduits/memo/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/e-util \ -I$(top_builddir)/e-util \ -I$(top_srcdir)/widgets/misc \ diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am index 5141393c91..f17535f6de 100644 --- a/calendar/conduits/todo/Makefile.am +++ b/calendar/conduits/todo/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/e-util \ -I$(top_builddir)/e-util \ -I$(top_srcdir)/widgets/misc \ diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 95576afc33..6b515f442a 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -38,7 +38,7 @@ search_files = tasktypes.xml memotypes.xml caltypes.xml ruledir = $(privdatadir) rule_DATA = $(search_files) -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"calendar-gui\" \ -I$(top_builddir)/shell \ -I$(top_srcdir)/shell \ diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am index 9b001a0da0..680c5e95e5 100644 --- a/calendar/gui/alarm-notify/Makefile.am +++ b/calendar/gui/alarm-notify/Makefile.am @@ -17,7 +17,7 @@ $(CORBA_GENERATED_C): $(CORBA_GENERATED_H) privlibexec_PROGRAMS = evolution-alarm-notify -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-alarm-notify\" \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 8e7a1bf916..a9c752701d 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"calendar-gui\" \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am index 16a3fee232..8fa711b035 100644 --- a/calendar/importers/Makefile.am +++ b/calendar/importers/Makefile.am @@ -1,6 +1,6 @@ privsolib_LTLIBRARIES = libevolution-calendar-importers.la -INCLUDES = \ +AM_CPPFLAGS = \ -DEVOLUTION_SOUNDDIR=\""$(soundsdir)"\" \ -DG_LOG_DOMAIN=\"Evolution-Importer\" \ -I$(top_srcdir) \ diff --git a/composer/Makefile.am b/composer/Makefile.am index 97debe59d0..97af16bec5 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -19,7 +19,7 @@ libcomposerinclude_HEADERS = \ e-composer-autosave.h \ e-msg-composer.h -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_builddir)/composer \ diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 367a9c79d7..79080f9e9f 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -8,7 +8,7 @@ WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la PLATFORM_SOURCES = e-win32-reloc.c endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/widgets \ diff --git a/filter/Makefile.am b/filter/Makefile.am index b58b4b2db6..ea996c839f 100644 --- a/filter/Makefile.am +++ b/filter/Makefile.am @@ -1,7 +1,7 @@ glade_DATA = filter.glade -INCLUDES = \ +AM_CPPFLAGS = \ -I $(top_srcdir) \ -I $(top_srcdir)/e-util \ -I $(top_srcdir)/widgets/misc \ diff --git a/mail/Makefile.am b/mail/Makefile.am index a7602c99dd..f8277aa9e0 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = default importers mailincludedir = $(privincludedir)/mail -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ -I$(top_srcdir) \ diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index 197415b4ee..5e46a54c4d 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -6,7 +6,7 @@ endif privsolib_LTLIBRARIES = libevolution-mail-importers.la -INCLUDES = -I.. \ +AM_CPPFLAGS = -I.. \ -I$(srcdir)/.. \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ 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 97e1abc696..6d207ef839 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 006b39f3c8..b9ee89f93b 100644 --- a/plugins/audio-inline/Makefile.am +++ b/plugins/audio-inline/Makefile.am @@ -5,7 +5,7 @@ NO_UNDEFINED_REQUIRED_LIBS = \ $(GNOME_PLATFORM_LIBS) endif -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 481d465887..182c1e808b 100644 --- a/plugins/bbdb/Makefile.am +++ b/plugins/bbdb/Makefile.am @@ -5,7 +5,7 @@ NO_UNDEFINED_REQUIRED_LIBS = \ $(GNOME_PLATFORM_LIBS) endif -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 5dc0cc626c..f488ddf0f7 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 0e43fa1717..f90d26e7e3 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -1,7 +1,7 @@ eds_datadir = `pkg-config --variable=privdatadir evolution-data-server-1.2` weatherdatadir = $(datadir)/evolution/$(BASE_VERSION)/weather -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir)/shell \ $(EVOLUTION_CALENDAR_CFLAGS) \ diff --git a/plugins/copy-tool/Makefile.am b/plugins/copy-tool/Makefile.am index 5f9e3bb463..87d1dff454 100644 --- a/plugins/copy-tool/Makefile.am +++ b/plugins/copy-tool/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am index 78766909c5..94d3436f0e 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_builddir)/shell \ $(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 6d3b6b8967..efd46a5435 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 4373b81ee5..05457efd17 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -6,7 +6,7 @@ NO_UNDEFINED_REQUIRED_LIBS = \ $(top_builddir)/mail/libevolution-mail.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ -DPREFIX=\""$(prefix)"\" \ diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index 59cf66e93e..86a522a2d0 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/folder-unsubscribe/Makefile.am b/plugins/folder-unsubscribe/Makefile.am index b3f1ba12bf..242d911ed0 100644 --- a/plugins/folder-unsubscribe/Makefile.am +++ b/plugins/folder-unsubscribe/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) 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 c72cc89850..1af407dcd7 100644 --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -2,7 +2,7 @@ if OS_WIN32 NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la endif -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 69b94ffbb1..c539a70cb2 100644 --- a/plugins/imap-features/Makefile.am +++ b/plugins/imap-features/Makefile.am @@ -2,7 +2,7 @@ if OS_WIN32 NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la endif -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 1ad1d0a4ee..a55fc83a4e 100644 --- a/plugins/ipod-sync/Makefile.am +++ b/plugins/ipod-sync/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(EVOLUTION_CALENDAR_CFLAGS) \ 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-account-disable/Makefile.am b/plugins/mail-account-disable/Makefile.am index d10638d90a..7793f851d7 100644 --- a/plugins/mail-account-disable/Makefile.am +++ b/plugins/mail-account-disable/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir)/mail \ diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index f3434fd4e8..ec91117eb8 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -5,14 +5,14 @@ NO_UNDEFINED_REQUIRED_LIBS = \ $(GNOME_PLATFORM_LIBS) endif -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 5261fbcf97..dc63da7a8c 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/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 724277826c..b653e8c1f7 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 f98e8be2ab..6121bd7f85 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 645581e11d..eb8126c398 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 037219c5ed..b276c41296 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 1103a669c6..3cf631a4ed 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -6,7 +6,7 @@ NO_UNDEFINED_REQUIRED_LIBS = \ $(EVOLUTION_MAIL_LIBS) endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(EVOLUTION_SOURCE) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ 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 77441e0e9b..f6a48ac727 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 b3530d841c..8e5ddd49fd 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 4e44fa5c3b..eebfdf0c26 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) \ $(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/select-one-source/Makefile.am b/plugins/select-one-source/Makefile.am index ec90904e70..3788fd30fa 100644 --- a/plugins/select-one-source/Makefile.am +++ b/plugins/select-one-source/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 fea7f7232f..81c75776d9 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 6ea2ce1f3e..d9447f263d 100644 --- a/plugins/tnef-attachments/Makefile.am +++ b/plugins/tnef-attachments/Makefile.am @@ -6,7 +6,7 @@ NO_UNDEFINED_REQUIRED_LIBS = \ $(top_builddir)/mail/libevolution-mail.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \ -DLOCALEDIR="\"$(localedir)\"" \ diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am index 499db50154..5a8ed2c88e 100644 --- a/plugins/vcard-inline/Makefile.am +++ b/plugins/vcard-inline/Makefile.am @@ -5,7 +5,7 @@ NO_UNDEFINED_REQUIRED_LIBS = \ $(GNOME_PLATFORM_LIBS) endif -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) diff --git a/shell/Makefile.am b/shell/Makefile.am index 0edf5f87a3..4f89e2fd31 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -2,7 +2,7 @@ if ENABLE_TEST_COMPONENT SUBDIRS = . test endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ -I$(top_srcdir) \ diff --git a/shell/importer/Makefile.am b/shell/importer/Makefile.am index 1aa5d5b484..06735179af 100644 --- a/shell/importer/Makefile.am +++ b/shell/importer/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/shell \ -I$(top_builddir)/shell \ diff --git a/shell/test/Makefile.am b/shell/test/Makefile.am index 74bd509958..8a2efd8a4a 100644 --- a/shell/test/Makefile.am +++ b/shell/test/Makefile.am @@ -1,6 +1,6 @@ component_LTLIBRARIES = libevolution-test.la -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/shell \ -I$(top_srcdir)/widgets/misc \ -I$(top_builddir)/shell \ diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am index 02bfd859f9..16b907e70c 100644 --- a/smime/gui/Makefile.am +++ b/smime/gui/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-smime\" \ -I$(top_srcdir) \ -I$(top_builddir) \ diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am index c43da4ea10..8cd547a15b 100644 --- a/smime/lib/Makefile.am +++ b/smime/lib/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-smime\" \ -I$(top_srcdir) \ -I$(top_srcdir)/shell \ diff --git a/smime/tests/Makefile.am b/smime/tests/Makefile.am index da284b0206..777d3278d6 100644 --- a/smime/tests/Makefile.am +++ b/smime/tests/Makefile.am @@ -1,7 +1,7 @@ noinst_PROGRAMS=import-cert -INCLUDES= \ +AM_CPPFLAGS= \ -I$(top_srcdir)/smime/lib \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ $(CERT_UI_CFLAGS) diff --git a/tools/Makefile.am b/tools/Makefile.am index 4860746fd7..d16cd7a4a2 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -7,7 +7,7 @@ endif privlibexec_PROGRAMS = \ $(PLATFORM_DEP_TOOLS) -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-tools\" \ -I$(top_srcdir) \ -I$(top_builddir) \ diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am index 64594fd889..cdc88e3b08 100644 --- a/widgets/e-timezone-dialog/Makefile.am +++ b/widgets/e-timezone-dialog/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am index 5d0c5ca989..f67a07370c 100644 --- a/widgets/menus/Makefile.am +++ b/widgets/menus/Makefile.am @@ -1,6 +1,6 @@ privsolib_LTLIBRARIES = libmenus.la -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index e40664be05..303efa878b 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -2,7 +2,7 @@ if OS_WIN32 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libfilter.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/a11y/widgets \ -I$(top_srcdir)/widgets \ diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am index 0dbe1e6fe3..4ae0861027 100644 --- a/widgets/table/Makefile.am +++ b/widgets/table/Makefile.am @@ -8,7 +8,7 @@ glade_DATA = \ e-table-config.glade \ e-table-field-chooser.glade -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(E_WIDGETS_CFLAGS) \ diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am index fbe03c828f..ad106158d9 100644 --- a/widgets/text/Makefile.am +++ b/widgets/text/Makefile.am @@ -2,7 +2,7 @@ if OS_WIN32 WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(E_UTIL_CFLAGS) \ |