[folks] Re-locate the EDS headers.

[Travis Reitter <treitter src gnome org>]

commit bbfd558f7670170fc30c4bd854a7cafbc11a4de4
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Tue Jul 12 14:50:26 2011 -0700

    Re-locate the EDS headers.
    
    This is related to bgo#649790 - Vala uses the wrong includes

 backends/eds/Makefile.am         |    1 +
 backends/eds/lib/Makefile.am     |    7 ++++---
 backends/eds/lib/folks-eds.pc.in |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/backends/eds/Makefile.am b/backends/eds/Makefile.am
index e49f898..332ba46 100644
--- a/backends/eds/Makefile.am
+++ b/backends/eds/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = lib
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/folks \
 	-I$(top_srcdir)/backends/eds/lib \
+	-I$(top_srcdir)/backends/eds/lib/folks \
 	-include $(CONFIG_HEADER) \
 	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
 	-DBACKEND_NAME=\"$(BACKEND_NAME)\" \
diff --git a/backends/eds/lib/Makefile.am b/backends/eds/lib/Makefile.am
index 4a7242e..eebaeb0 100644
--- a/backends/eds/lib/Makefile.am
+++ b/backends/eds/lib/Makefile.am
@@ -39,8 +39,9 @@ VALAFLAGS = \
 	--vapidir=. \
 	--vapidir=$(top_srcdir)/folks \
 	$(addprefix --pkg ,$(folks_backend_eds_deps)) \
+	--includedir folks \
 	--vapi folks-eds.vapi \
-	-H folks-eds.h \
+	-H folks/folks-eds.h \
 	$(NULL)
 
 folks_backend_eds_deps = \
@@ -82,7 +83,7 @@ libfolks_eds_la_LDFLAGS = \
 
 folks_eds_includedir = $(includedir)/folks
 folks_eds_include_HEADERS = \
-	folks-eds.h \
+	folks/folks-eds.h \
 	$(NULL)
 
 vapidir = $(datadir)/vala/vapi
@@ -103,7 +104,7 @@ CLEANFILES += \
 MAINTAINERCLEANFILES = \
 	$(folks_eds_valasources:.vala=.c) \
 	libfolks_eds_la_vala.stamp \
-	folks-eds.h \
+	folks/folks-eds.h \
 	folks-eds.vapi \
 	$(NULL)
 
diff --git a/backends/eds/lib/folks-eds.pc.in b/backends/eds/lib/folks-eds.pc.in
index 4e01ba4..4d581af 100644
--- a/backends/eds/lib/folks-eds.pc.in
+++ b/backends/eds/lib/folks-eds.pc.in
@@ -12,4 +12,4 @@ Description: Evolution Data Server support library for the Folks meta-contacts l
 Version: @VERSION@
 Requires: folks glib-2.0 gobject-2.0 gee-1.0 libebook-1.2 libedataserver-1.2
 Libs: -L${libdir} -lfolks-eds
-Cflags: -I${includedir} -I${includedir}/folks
+Cflags: -I${includedir}