[evolution-data-server] Use AM_CPPFLAGS instead of INCLUDE in all Makefile.am.

From: Matthew Barnes <mbarnes src gnome org>
To: svn-commits-list gnome org
Subject: [evolution-data-server] Use AM_CPPFLAGS instead of INCLUDE in all Makefile.am.
Date: Tue, 30 Jun 2009 21:16:33 +0000 (UTC)
commit e74d043d5a02ae2e311c923b8d3e472c2d5594d8
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Jun 30 17:14:36 2009 -0400

    Use AM_CPPFLAGS instead of INCLUDE in all Makefile.am.

 addressbook/backends/file/Makefile.am      |    2 +-
 addressbook/backends/google/Makefile.am    |    2 +-
 addressbook/backends/groupwise/Makefile.am |    2 +-
 addressbook/backends/ldap/Makefile.am      |    2 +-
 addressbook/backends/vcf/Makefile.am       |    2 +-
 addressbook/backends/webdav/Makefile.am    |    2 +-
 addressbook/libebook/Makefile.am           |    2 +-
 addressbook/libedata-book/Makefile.am      |    2 +-
 addressbook/tests/ebook/Makefile.am        |    2 +-
 addressbook/tests/vcard/Makefile.am        |    2 +-
 calendar/backends/caldav/Makefile.am       |    2 +-
 calendar/backends/contacts/Makefile.am     |    2 +-
 calendar/backends/file/Makefile.am         |    2 +-
 calendar/backends/google/Makefile.am       |    2 +-
 calendar/backends/groupwise/Makefile.am    |    2 +-
 calendar/backends/http/Makefile.am         |    2 +-
 calendar/backends/weather/Makefile.am      |    2 +-
 calendar/libecal/Makefile.am               |    2 +-
 calendar/libedata-cal/Makefile.am          |    2 +-
 calendar/tests/ecal/Makefile.am            |    2 +-
 camel/Makefile.am                          |    2 +-
 camel/providers/groupwise/Makefile.am      |    2 +-
 camel/providers/hula/Makefile.am           |    2 +-
 camel/providers/imap/Makefile.am           |    2 +-
 camel/providers/imap4/Makefile.am          |    2 +-
 camel/providers/imapp/Makefile.am          |    2 +-
 camel/providers/local/Makefile.am          |    2 +-
 camel/providers/nntp/Makefile.am           |    2 +-
 camel/providers/pop3/Makefile.am           |    2 +-
 camel/providers/sendmail/Makefile.am       |    2 +-
 camel/providers/smtp/Makefile.am           |    2 +-
 camel/tests/folder/Makefile.am             |    2 +-
 camel/tests/lib/Makefile.am                |    2 +-
 camel/tests/message/Makefile.am            |    2 +-
 camel/tests/mime-filter/Makefile.am        |    2 +-
 camel/tests/misc/Makefile.am               |    2 +-
 camel/tests/smime/Makefile.am              |    2 +-
 camel/tests/stream/Makefile.am             |    2 +-
 docs/reference/camel/Makefile.am           |    2 +-
 libebackend/Makefile.am                    |    2 +-
 libedataserver/Makefile.am                 |    2 +-
 libedataserverui/Makefile.am               |    2 +-
 servers/exchange/lib/Makefile.am           |    2 +-
 servers/exchange/storage/Makefile.am       |    2 +-
 servers/exchange/xntlm/Makefile.am         |    2 +-
 servers/google/libgdata-google/Makefile.am |    2 +-
 servers/google/libgdata/Makefile.am        |    2 +-
 servers/groupwise/Makefile.am              |    2 +-
 src/Makefile.am                            |    2 +-
 49 files changed, 49 insertions(+), 49 deletions(-)
---
diff --git a/addressbook/backends/file/Makefile.am b/addressbook/backends/file/Makefile.am
index c4dd1b6..f84d32b 100644
--- a/addressbook/backends/file/Makefile.am
+++ b/addressbook/backends/file/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"libebookbackend\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/addressbook/backends/google/Makefile.am b/addressbook/backends/google/Makefile.am
index 19f3932..fde983e 100644
--- a/addressbook/backends/google/Makefile.am
+++ b/addressbook/backends/google/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"libebookbackendgoogle\" \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
diff --git a/addressbook/backends/groupwise/Makefile.am b/addressbook/backends/groupwise/Makefile.am
index 625f19a..5f3e667 100644
--- a/addressbook/backends/groupwise/Makefile.am
+++ b/addressbook/backends/groupwise/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"libebookbackend\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/addressbook/backends/ldap/Makefile.am b/addressbook/backends/ldap/Makefile.am
index 2b3d2fb..f4def36 100644
--- a/addressbook/backends/ldap/Makefile.am
+++ b/addressbook/backends/ldap/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"libebookbackend\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/addressbook/backends/vcf/Makefile.am b/addressbook/backends/vcf/Makefile.am
index 9285665..513594c 100644
--- a/addressbook/backends/vcf/Makefile.am
+++ b/addressbook/backends/vcf/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"libebookbackend\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/addressbook/backends/webdav/Makefile.am b/addressbook/backends/webdav/Makefile.am
index e4cebd1..45e47df 100644
--- a/addressbook/backends/webdav/Makefile.am
+++ b/addressbook/backends/webdav/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"libebookbackendgoogle\" \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index f78cf36..9622338 100644
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DG_LOG_DOMAIN=\"libebook\"			\
 	-I$(top_srcdir)					\
diff --git a/addressbook/libedata-book/Makefile.am b/addressbook/libedata-book/Makefile.am
index 2865c39..6389ce4 100644
--- a/addressbook/libedata-book/Makefile.am
+++ b/addressbook/libedata-book/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"libedata-book\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/addressbook/tests/ebook/Makefile.am b/addressbook/tests/ebook/Makefile.am
index 0fe6bf6..bc6a2da 100644
--- a/addressbook/tests/ebook/Makefile.am
+++ b/addressbook/tests/ebook/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = 				\
+AM_CPPFLAGS = 				\
 	-I$(top_srcdir)			\
 	-I$(top_builddir)		\
 	-I$(top_srcdir)/addressbook	\
diff --git a/addressbook/tests/vcard/Makefile.am b/addressbook/tests/vcard/Makefile.am
index d48d356..48801e8 100644
--- a/addressbook/tests/vcard/Makefile.am
+++ b/addressbook/tests/vcard/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = 				\
+AM_CPPFLAGS = 				\
 	-I$(top_srcdir)			\
 	-I$(top_builddir)		\
 	-I$(top_srcdir)/addressbook	\
diff --git a/calendar/backends/caldav/Makefile.am b/calendar/backends/caldav/Makefile.am
index eaa7a00..0c85597 100644
--- a/calendar/backends/caldav/Makefile.am
+++ b/calendar/backends/caldav/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/calendar \
 	-I$(top_builddir)/calendar \
diff --git a/calendar/backends/contacts/Makefile.am b/calendar/backends/contacts/Makefile.am
index 23bf940..e81a8e0 100644
--- a/calendar/backends/contacts/Makefile.am
+++ b/calendar/backends/contacts/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"libecalbackendcontact\"	\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/calendar/backends/file/Makefile.am b/calendar/backends/file/Makefile.am
index e2e272c..e1e39a7 100644
--- a/calendar/backends/file/Makefile.am
+++ b/calendar/backends/file/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"libecalbackendfile\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/calendar/backends/google/Makefile.am b/calendar/backends/google/Makefile.am
index ad409de..f22cbae 100644
--- a/calendar/backends/google/Makefile.am
+++ b/calendar/backends/google/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"libecalbackendgoogle\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/calendar/backends/groupwise/Makefile.am b/calendar/backends/groupwise/Makefile.am
index 466692d..c362c56 100644
--- a/calendar/backends/groupwise/Makefile.am
+++ b/calendar/backends/groupwise/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"libecalbackendgroupwise\"	\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/calendar/backends/http/Makefile.am b/calendar/backends/http/Makefile.am
index 98fd09a..cd8ef34 100644
--- a/calendar/backends/http/Makefile.am
+++ b/calendar/backends/http/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"libecalbackendhttp\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/calendar/backends/weather/Makefile.am b/calendar/backends/weather/Makefile.am
index 6bec915..15e81bb 100644
--- a/calendar/backends/weather/Makefile.am
+++ b/calendar/backends/weather/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"libecalbackendweather\"	\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am
index 8e2255c..23302b1 100644
--- a/calendar/libecal/Makefile.am
+++ b/calendar/libecal/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"libecal\"			\
 	-I$(top_srcdir)/calendar			\
 	-I$(srcdir) -I$(top_srcdir) 			\
diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am
index 3bdb136..af88409 100644
--- a/calendar/libedata-cal/Makefile.am
+++ b/calendar/libedata-cal/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"libedata-cal\"			\
 	-DBASE_VERSION=\""$(BASE_VERSION)"\"		\
 	-I$(top_srcdir)					\
diff --git a/calendar/tests/ecal/Makefile.am b/calendar/tests/ecal/Makefile.am
index 2cef682..f4fd783 100644
--- a/calendar/tests/ecal/Makefile.am
+++ b/calendar/tests/ecal/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 311e1f2..8d3123d 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -33,7 +33,7 @@ camellibexec_PROGRAMS =	$(LOCK_HELPER) camel-index-control-1.2
 
 lib_LTLIBRARIES = libcamel-1.2.la libcamel-provider-1.2.la
 
-INCLUDES = -I.. -I$(srcdir)/.. 			 	\
+AM_CPPFLAGS = -I.. -I$(srcdir)/.. 			 	\
 	-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\"	\
 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" 	\
 	-DG_LOG_DOMAIN=\"camel\"			\
diff --git a/camel/providers/groupwise/Makefile.am b/camel/providers/groupwise/Makefile.am
index 093062d..c7d69c6 100644
--- a/camel/providers/groupwise/Makefile.am
+++ b/camel/providers/groupwise/Makefile.am
@@ -3,7 +3,7 @@
 camel_provider_LTLIBRARIES = libcamelgroupwise.la
 camel_provider_DATA = libcamelgroupwise.urls
 
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/camel			\
 	-I$(top_srcdir)/camel/providers/imap    \
diff --git a/camel/providers/hula/Makefile.am b/camel/providers/hula/Makefile.am
index 7d58a82..8d17a0e 100644
--- a/camel/providers/hula/Makefile.am
+++ b/camel/providers/hula/Makefile.am
@@ -3,7 +3,7 @@
 camel_provider_LTLIBRARIES = libcamelhula.la
 camel_provider_DATA = libcamelhula.urls
 
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/camel			\
 	-I$(top_srcdir)/camel/providers/imap    \
diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am
index a169ab7..86e4b8b 100644
--- a/camel/providers/imap/Makefile.am
+++ b/camel/providers/imap/Makefile.am
@@ -3,7 +3,7 @@
 camel_provider_LTLIBRARIES = libcamelimap.la
 camel_provider_DATA = libcamelimap.urls
 
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
 	-I$(srcdir)/..				\
 	-I$(top_srcdir)/camel			\
 	-I$(top_srcdir)				\
diff --git a/camel/providers/imap4/Makefile.am b/camel/providers/imap4/Makefile.am
index 21abe7b..6b0b61f 100644
--- a/camel/providers/imap4/Makefile.am
+++ b/camel/providers/imap4/Makefile.am
@@ -3,7 +3,7 @@
 camel_provider_LTLIBRARIES = libcamelimap4.la
 camel_provider_DATA = libcamelimap4.urls
 
-INCLUDES = 					\
+AM_CPPFLAGS = 					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/camel			\
 	-I$(top_srcdir)				\
diff --git a/camel/providers/imapp/Makefile.am b/camel/providers/imapp/Makefile.am
index c2b475c..8c0ed9e 100644
--- a/camel/providers/imapp/Makefile.am
+++ b/camel/providers/imapp/Makefile.am
@@ -3,7 +3,7 @@
 camel_provider_LTLIBRARIES = libcamelimapp.la
 camel_provider_DATA = libcamelimapp.urls
 
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
 	-I$(srcdir)/..				\
 	-I$(top_srcdir)/camel			\
 	-I$(top_srcdir)				\
diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am
index 8d1c4a1..02d4d98 100644
--- a/camel/providers/local/Makefile.am
+++ b/camel/providers/local/Makefile.am
@@ -18,7 +18,7 @@ SYSDEP_PROVIDER_SOURCES = \
 	camel-spool-summary.c
 endif
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/camel			\
 	-I$(top_srcdir)				\
 	$(CAMEL_CFLAGS)				\
diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am
index b09bb38..bca0d12 100644
--- a/camel/providers/nntp/Makefile.am
+++ b/camel/providers/nntp/Makefile.am
@@ -3,7 +3,7 @@
 camel_provider_LTLIBRARIES = libcamelnntp.la
 camel_provider_DATA = libcamelnntp.urls
 
-INCLUDES = -I../..				\
+AM_CPPFLAGS = -I../..				\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/camel			\
 	-I$(top_srcdir)				\
diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am
index bf56e2c..46f92f3 100644
--- a/camel/providers/pop3/Makefile.am
+++ b/camel/providers/pop3/Makefile.am
@@ -3,7 +3,7 @@
 camel_provider_LTLIBRARIES = libcamelpop3.la
 camel_provider_DATA = libcamelpop3.urls
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/camel			\
 	$(CAMEL_CFLAGS)				\
diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am
index 00ca6d0..0425d7e 100644
--- a/camel/providers/sendmail/Makefile.am
+++ b/camel/providers/sendmail/Makefile.am
@@ -3,7 +3,7 @@
 camel_provider_LTLIBRARIES = libcamelsendmail.la
 camel_provider_DATA = libcamelsendmail.urls
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I..						\
 	-I$(srcdir)/..					\
 	-I$(srcdir)/../../..				\
diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am
index 0616eb2..21bcd18 100644
--- a/camel/providers/smtp/Makefile.am
+++ b/camel/providers/smtp/Makefile.am
@@ -3,7 +3,7 @@
 camel_provider_LTLIBRARIES = libcamelsmtp.la
 camel_provider_DATA = libcamelsmtp.urls
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/camel			\
 	$(CAMEL_CFLAGS)				\
diff --git a/camel/tests/folder/Makefile.am b/camel/tests/folder/Makefile.am
index 576705a..1763a5d 100644
--- a/camel/tests/folder/Makefile.am
+++ b/camel/tests/folder/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(includedir)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/camel				\
diff --git a/camel/tests/lib/Makefile.am b/camel/tests/lib/Makefile.am
index 659264d..541763f 100644
--- a/camel/tests/lib/Makefile.am
+++ b/camel/tests/lib/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(includedir)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/camel				\
diff --git a/camel/tests/message/Makefile.am b/camel/tests/message/Makefile.am
index 4dface2..575d5f8 100644
--- a/camel/tests/message/Makefile.am
+++ b/camel/tests/message/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(includedir)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/camel				\
diff --git a/camel/tests/mime-filter/Makefile.am b/camel/tests/mime-filter/Makefile.am
index 06e3a5c..2216192 100644
--- a/camel/tests/mime-filter/Makefile.am
+++ b/camel/tests/mime-filter/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(includedir)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/camel				\
diff --git a/camel/tests/misc/Makefile.am b/camel/tests/misc/Makefile.am
index bb3343e..a5cf63c 100644
--- a/camel/tests/misc/Makefile.am
+++ b/camel/tests/misc/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(includedir)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/camel				\
diff --git a/camel/tests/smime/Makefile.am b/camel/tests/smime/Makefile.am
index 39ecda9..25a8489 100644
--- a/camel/tests/smime/Makefile.am
+++ b/camel/tests/smime/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(includedir)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/camel				\
diff --git a/camel/tests/stream/Makefile.am b/camel/tests/stream/Makefile.am
index 0f30894..9363e68 100644
--- a/camel/tests/stream/Makefile.am
+++ b/camel/tests/stream/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-I$(includedir)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/camel				\
diff --git a/docs/reference/camel/Makefile.am b/docs/reference/camel/Makefile.am
index 4ca5560..d3d4b3a 100644
--- a/docs/reference/camel/Makefile.am
+++ b/docs/reference/camel/Makefile.am
@@ -30,7 +30,7 @@ MKDB_OPTIONS = --sgml-mode --output-format=xml --ignore-files=trio
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) 	\
 	-I$(top_builddir) 	\
 	-I$(top_builddir)/camel \
diff --git a/libebackend/Makefile.am b/libebackend/Makefile.am
index 754e039..7b18038 100644
--- a/libebackend/Makefile.am
+++ b/libebackend/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_srcdir)							\
 	-DG_LOG_DOMAIN=\"e-data-server\"				\
 	-DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\"		\
diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am
index b9924c7..8d10cd8 100644
--- a/libedataserver/Makefile.am
+++ b/libedataserver/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_srcdir)							\
 	-DG_LOG_DOMAIN=\"e-data-server\"				\
 	-DE_DATA_SERVER_PREFIX=\"$(prefix)\"				\
diff --git a/libedataserverui/Makefile.am b/libedataserverui/Makefile.am
index b4e7ad4..2daaf7b 100644
--- a/libedataserverui/Makefile.am
+++ b/libedataserverui/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/addressbook					\
 	-I$(top_builddir)/addressbook					\
diff --git a/servers/exchange/lib/Makefile.am b/servers/exchange/lib/Makefile.am
index cdae2fb..50fa3af 100644
--- a/servers/exchange/lib/Makefile.am
+++ b/servers/exchange/lib/Makefile.am
@@ -1,6 +1,6 @@
 # Fix the code to not use E_DATA_SERVER_UI_CFLAGS
 
-INCLUDES =                                                      \
+AM_CPPFLAGS =                                                      \
 	-DCONNECTOR_PREFIX=\""$(prefix)"\"			\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/servers/exchange/xntlm			\
diff --git a/servers/exchange/storage/Makefile.am b/servers/exchange/storage/Makefile.am
index 6301f6a..1d9a08d 100644
--- a/servers/exchange/storage/Makefile.am
+++ b/servers/exchange/storage/Makefile.am
@@ -5,7 +5,7 @@ WIN32_BOOTSTRAP_LIBS =					\
 	$(top_builddir)/win32/libedataserverui-1.2.la
 endif
 
-INCLUDES =							\
+AM_CPPFLAGS =							\
 	-DG_LOG_DOMAIN=\"evolution-exchange-storage\"		\
 	-DPREFIX=\"$(prefix)\"					\
 	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
diff --git a/servers/exchange/xntlm/Makefile.am b/servers/exchange/xntlm/Makefile.am
index ef8df16..c6316d9 100644
--- a/servers/exchange/xntlm/Makefile.am
+++ b/servers/exchange/xntlm/Makefile.am
@@ -8,6 +8,6 @@ libxntlm_la_SOURCES =	\
 	xntlm-md4.c	\
 	xntlm-md4.h
 
-INCLUDES =		\
+AM_CPPFLAGS =		\
 	-I$(top_srcdir)	\
 	$(GLIB_CFLAGS)
diff --git a/servers/google/libgdata-google/Makefile.am b/servers/google/libgdata-google/Makefile.am
index 61fc831..006083b 100644
--- a/servers/google/libgdata-google/Makefile.am
+++ b/servers/google/libgdata-google/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =							\
+AM_CPPFLAGS =							\
 	-DG_LOG_DOMAIN=\"libgdata-google\"			\
 	-I$(top_srcdir)						\
 	-I$(top_builddir)					\
diff --git a/servers/google/libgdata/Makefile.am b/servers/google/libgdata/Makefile.am
index e12dcf9..78ca15d 100644
--- a/servers/google/libgdata/Makefile.am
+++ b/servers/google/libgdata/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"libgdata\"			\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/servers/groupwise/Makefile.am b/servers/groupwise/Makefile.am
index 21c6021..dd7eeb8 100644
--- a/servers/groupwise/Makefile.am
+++ b/servers/groupwise/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"libegroupwise\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
diff --git a/src/Makefile.am b/src/Makefile.am
index 07ad46f..2d62972 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	-DG_LOG_DOMAIN=\"evolution-data-server\"	\
 	-DPREFIX=\"$(prefix)\"				\
 	-DSYSCONFDIR=\"$(sysconfdir)\"			\
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]