Ensure includes are done with <folks/*.h>

This changes all pc files to not include -I$incdir/folks and fixes
the vapi files to add the folks/ part to the includes.

https://bugzilla.gnome.org/show_bug.cgi?id=649790

9 files changed, 11 insertions, 4 deletions

diff --git a/NEWS b/NEWS
index 36bec67..008e8f3 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ Bugs fixed:
 * Bug 648161 — Add GObject Introspection Support
 * Bug 645186 — Make sure all connect() calls have appropriate disconnect() calls
 * Bug 648533 — Add runtime debug signalling
+* Bug 649790 — Vala uses the wrong includes
 
 API changes:
 * LinkedHashSet.list_iterator() is now disallowed (causes an assertion failure)
@@ -51,6 +52,8 @@ API changes:
 * PotentialMatch.known_email_aliases now has type Set<string>
 * PostalAddress.types now has type Set<string>
 * Add Folks.Debug debug controller class
+* All pc-files now only add the $includedir to the cflags, so all includes
+  must be of the form <folks/*.h>
 
 Overview of changes from libfolks 0.4.0 to libfolks 0.5.0
 =========================================================
diff --git a/backends/libsocialweb/lib/Makefile.am b/backends/libsocialweb/lib/Makefile.am
index b0859a8..25f7a74 100644
--- a/backends/libsocialweb/lib/Makefile.am
+++ b/backends/libsocialweb/lib/Makefile.am
@@ -46,6 +46,7 @@ libfolks_libsocialweb_la_VALAFLAGS = \
         --pkg gee-1.0 \
         --pkg dbus-glib-1 \
         --pkg libsocialweb-client \
+        --includedir folks \
         --vapi folks-libsocialweb.vapi \
         -H folks-libsocialweb.h \
         $(NULL)
diff --git a/backends/libsocialweb/lib/folks-libsocialweb.pc.in b/backends/libsocialweb/lib/folks-libsocialweb.pc.in
index 6e43b5c..3fac010 100644
--- a/backends/libsocialweb/lib/folks-libsocialweb.pc.in
+++ b/backends/libsocialweb/lib/folks-libsocialweb.pc.in
@@ -12,4 +12,4 @@ Description: Libsocialweb support library for the Folks meta-contacts library
 Version: @VERSION@
 Requires: folks glib-2.0 gobject-2.0 gee-1.0 libsocialweb-client
 Libs: -L${libdir} -lfolks-libsocialweb
-Cflags: -I${includedir} -I${includedir}/folks
+Cflags: -I${includedir}
diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
index 60ab810..9e9073e 100644
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@ -112,6 +112,7 @@ libfolks_telepathy_la_VALAFLAGS = \
 	--pkg gee-1.0 \
 	--pkg dbus-glib-1 \
 	--pkg telepathy-glib \
+	--includedir folks \
 	--vapi folks-telepathy.vapi \
 	-H folks-telepathy.h \
 	$(NULL)
diff --git a/backends/telepathy/lib/folks-telepathy.pc.in b/backends/telepathy/lib/folks-telepathy.pc.in
index bdfecf8..4f9b67b 100644
--- a/backends/telepathy/lib/folks-telepathy.pc.in
+++ b/backends/telepathy/lib/folks-telepathy.pc.in
@@ -12,4 +12,4 @@ Description: Telepathy support library for the Folks meta-contacts library
 Version: @VERSION@
 Requires: folks glib-2.0 gobject-2.0 gee-1.0 telepathy-glib >= 0.11.11
 Libs: -L${libdir} -lfolks-telepathy
-Cflags: -I${includedir} -I${includedir}/folks
+Cflags: -I${includedir}
diff --git a/backends/tracker/lib/Makefile.am b/backends/tracker/lib/Makefile.am
index d4a8b80..1e13698 100644
--- a/backends/tracker/lib/Makefile.am
+++ b/backends/tracker/lib/Makefile.am
@@ -45,6 +45,7 @@ libfolks_tracker_la_VALAFLAGS = \
 	--pkg gio-2.0 \
 	--pkg gee-1.0 \
 	--pkg tracker-sparql-0.10 \
+	--includedir folks \
 	--vapi folks-tracker.vapi \
 	-H folks-tracker.h \
 	$(NULL)
diff --git a/backends/tracker/lib/folks-tracker.pc.in b/backends/tracker/lib/folks-tracker.pc.in
index bff6680..ee83754 100644
--- a/backends/tracker/lib/folks-tracker.pc.in
+++ b/backends/tracker/lib/folks-tracker.pc.in
@@ -12,4 +12,4 @@ Description: Tracker support library for the Folks meta-contacts library
 Version: @VERSION@
 Requires: folks glib-2.0 gobject-2.0 gee-1.0 tracker-sparql-0.10
 Libs: -L${libdir} -lfolks-tracker
-Cflags: -I${includedir} -I${includedir}/folks
+Cflags: -I${includedir}
diff --git a/folks/Makefile.am b/folks/Makefile.am
index cc6db7b..17e1928 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -52,6 +52,7 @@ libfolks_la_VALAFLAGS = \
 	--pkg gio-2.0 \
 	--pkg gee-1.0 \
 	--pkg gconf-2.0 \
+	--includedir folks \
 	--vapi folks.vapi \
 	-H folks.h \
 	$(NULL)
diff --git a/folks/folks-uninstalled.pc.in b/folks/folks-uninstalled.pc.in
index 9efabf8..0443df0 100644
--- a/folks/folks-uninstalled.pc.in
+++ b/folks/folks-uninstalled.pc.in
@@ -9,4 +9,4 @@ Description: The Folks meta-contacts library
 Version: @VERSION@
 Requires: glib-2.0 gobject-2.0 gee-1.0 telepathy-glib >= 0.11.11
 Libs: ${abs_top_builddir}/folks/libfolks.la
-Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/folks -I${abs_top_builddir}
+Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}