From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 20 Jun 2012 19:43:02 +0000 (-0400)
Subject: Fix build failures when $(top_srcdir) != $(top_builddir).
X-Git-Tag: upstream/3.7.4~748
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4bc0fd235298a75bd055f0954fb48748d8dcbdc8;p=platform%2Fupstream%2Fevolution-data-server.git

Fix build failures when $(top_srcdir) != $(top_builddir).

Really need to get distcheck working again...
---

diff --git a/addressbook/backends/google/Makefile.am b/addressbook/backends/google/Makefile.am
index f419927..8281a8f 100644
--- a/addressbook/backends/google/Makefile.am
+++ b/addressbook/backends/google/Makefile.am
@@ -69,6 +69,8 @@ libebook_google_utils_la_CFLAGS = \
 libebook_google_utils_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-DG_LOG_DOMAIN=\"libebookbackendgoogle\" \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
 	-I$(top_srcdir)/addressbook \
 	-I$(top_builddir)/addressbook \
 	$(NULL)
diff --git a/addressbook/backends/google/tests/Makefile.am b/addressbook/backends/google/tests/Makefile.am
index 3d2bb8e..6a4274c 100644
--- a/addressbook/backends/google/tests/Makefile.am
+++ b/addressbook/backends/google/tests/Makefile.am
@@ -1,5 +1,7 @@
 CPPFLAGS = \
 	$(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
 	-I$(top_srcdir)/addressbook \
 	-I$(top_builddir)/addressbook \
 	-I$(top_srcdir)/addressbook/backends/google \
diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am
index fc0f186..71d53b0 100644
--- a/calendar/libecal/Makefile.am
+++ b/calendar/libecal/Makefile.am
@@ -19,6 +19,7 @@ libecal_INCLUDES = \
 	-I$(top_srcdir)/calendar/libegdbus	\
 	-I$(top_srcdir)/calendar/libedata-cal	\
 	-I$(top_builddir)			\
+	-I$(top_builddir)/calendar		\
 	-I$(top_builddir)/calendar/libecal
 
 libecal_1_2_la_CPPFLAGS =			\
diff --git a/docs/reference/private/Makefile.am b/docs/reference/private/Makefile.am
index 85be6f0..aeb3790 100644
--- a/docs/reference/private/Makefile.am
+++ b/docs/reference/private/Makefile.am
@@ -11,8 +11,8 @@ SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED"
 DOC_SOURCE_DIR = $(top_srcdir)/private
 
 # Used for dependencies. The docs will be rebuilt if any of these change.
-HFILE_GLOB = $(top_srcdir)/private/*.h
-CFILE_GLOB = $(top_srcdir)/private/*.c
+HFILE_GLOB = $(top_builddir)/private/*.h
+CFILE_GLOB = $(top_builddir)/private/*.c
 
 IGNORE_HFILES =