commit 4c513155845bafd32ff6ceabbb9c1a313a64659f
Author: Matthew Barnes <mbarnes redhat com>
Date: Tue Jun 30 17:35:26 2009 -0400
Use AM_CPPFLAGS instead of INCLUDE in all Makefile.am.
addressbook/Makefile.am | 4 ++--
calendar/Makefile.am | 2 +-
camel/Makefile.am | 2 +-
docs/reference/Makefile.am | 2 +-
mail/Makefile.am | 2 +-
storage/Makefile.am | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 27fd26a..0f52a82 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/storage \
-DG_LOG_DOMAIN=\"e-book-backend-exchange\" \
@@ -7,7 +7,7 @@ INCLUDES = \
$(LDAP_CFLAGS)
if HAVE_LIBDB
-INCLUDES += "-I /usr/include" \
+AM_CPPFLAGS += "-I /usr/include" \
$(DB_CFLAGS)
endif
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index 31084ea..1674282 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/storage \
$(CALENDAR_CFLAGS) \
diff --git a/camel/Makefile.am b/camel/Makefile.am
index b3bbe1f..a563757 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -3,7 +3,7 @@
CAMEL_provider_LTLIBRARIES = libcamelexchange.la
CAMEL_provider_DATA = libcamelexchange.urls
-INCLUDES = \
+AM_CPPFLAGS = \
$(WARN_CFLAGS) \
$(GLIB_CFLAGS) \
$(CAMEL_CFLAGS) \
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 0686bc1..ea2a55e 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -35,7 +35,7 @@ CFILE_GLOB=$(top_srcdir)/*/*.c
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/lib \
-I$(top_builddir)/lib \
$(LIBEXCHANGE_CFLAGS) \
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 2234058..b263bc6 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -2,7 +2,7 @@
noinst_LTLIBRARIES = \
libexchangemail.la
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/camel \
-I$(top_srcdir)/storage \
diff --git a/storage/Makefile.am b/storage/Makefile.am
index 714c4f6..c12af73 100644
--- a/storage/Makefile.am
+++ b/storage/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/mail \
-I$(top_srcdir)/camel \