[evolution-data-server] Fix a few srcdir != builddir issues

[Colin Walters <walters src gnome org>]

commit aed28f90ca025dd41455b8549fc25036c7ed3605
Author: Colin Walters <walters verbum org>
Date:   Thu Jun 23 15:17:14 2011 -0400

    Fix a few srcdir != builddir issues
    
    jhbuild will be defaulting to this soon.

 addressbook/libebook/Makefile.am |    5 ++++-
 libedataserver/Makefile.am       |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index 36f55ed..fce463e 100644
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -16,6 +16,7 @@ libebook_1_2_la_CPPFLAGS = \
 	-I$(top_srcdir)/addressbook/libegdbus		\
 	-I$(top_builddir)				\
 	-I$(top_builddir)/addressbook			\
+	-I$(top_builddir)/addressbook/libegdbus		\
 	-I$(top_builddir)/addressbook/libebook		\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
 	$(CAMEL_CFLAGS)
@@ -90,11 +91,13 @@ EBook_1_2_gir_INCLUDES = GObject-2.0 EDataServer-1.2 GLib-2.0 libxml2-2.0 \
 libxml_include = `$(PKG_CONFIG) --cflags libxml-2.0`
 gconf_include = `$(PKG_CONFIG) --cflags gconf-2.0`
 EBook_1_2_gir_CFLAGS = $(INCLUDES) \
-		       -I$(top_srcdir) \
 		       $(libxml_include) \
 		       $(gconf_include) \
+		       -I$(top_srcdir) \
 		       -I$(top_builddir) \
+		       -I$(top_srcdir)/addressbook/ \
 		       -I$(top_builddir)/addressbook/ \
+		       -I$(top_srcdir)/addressbook/libebook \
 		       -I$(top_builddir)/addressbook/libebook \
 			$(NULL)
 EBook_1_2_gir_LIBS = \
diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am
index 0a2cef2..3dee9c0 100644
--- a/libedataserver/Makefile.am
+++ b/libedataserver/Makefile.am
@@ -113,7 +113,7 @@ introspection_sources = \
 
 EDataServer-1.2.gir: libedataserver-1.2.la
 EDataServer_1_2_gir_INCLUDES = GObject-2.0 libxml2-2.0 Gio-2.0
-EDataServer_1_2_gir_CFLAGS = -I$(top_srcdir) $(E_DATA_SERVER_CFLAGS) \
+EDataServer_1_2_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) $(E_DATA_SERVER_CFLAGS) \
 	$(SOUP_CFLAGS)
 EDataServer_1_2_gir_LIBS = libedataserver-1.2.la
 EDataServer_1_2_gir_FILES = $(introspection_sources)