From b1c568650ab4967db506e1c618a9950a959dabb3 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 15 Jun 2012 12:22:38 +0200
Subject: introspection: add info about C headers to use

vapigen needs this information to be able to generate correct
.vapi files.

https://bugzilla.gnome.org/show_bug.cgi?id=678153
---
 rest-extras/Makefile.am | 3 +++
 rest/Makefile.am        | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/rest-extras/Makefile.am b/rest-extras/Makefile.am
index fd0858e..dbf4fae 100644
--- a/rest-extras/Makefile.am
+++ b/rest-extras/Makefile.am
@@ -52,6 +52,9 @@ INTROSPECTION_GIRS = RestExtras-@API_VERSION@.gir
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_builddir)/rest --identifier-prefix=
 INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/rest
 
+REST_EXTRAS_CINCLUDES=$(patsubst %,--c-include='rest/%',$(shell echo $(lib_headers)))
+INTROSPECTION_SCANNER_ARGS += $(REST_EXTRAS_CINCLUDES)
+
 RestExtras-@API_VERSION@.gir: librest-extras-@API_VERSION@.la Makefile
 
 RestExtras_@API_VERSION_AM@_gir_NAMESPACE = RestExtras
diff --git a/rest/Makefile.am b/rest/Makefile.am
index 7e7ed0a..e8a313f 100644
--- a/rest/Makefile.am
+++ b/rest/Makefile.am
@@ -101,6 +101,8 @@ Rest_@API_VERSION_AM@_gir_INCLUDES = GObject-2.0 Gio-2.0
 Rest_@API_VERSION_AM@_gir_PACKAGES = gobject-2.0 libsoup-2.4 libxml-2.0 gio-2.0
 Rest_@API_VERSION_AM@_gir_SCANNERFLAGS = --accept-unprefixed
 Rest_@API_VERSION_AM@_gir_EXPORT_PACKAGES = rest-@API_VERSION@
+REST_CINCLUDES=$(patsubst %,--c-include='rest/%',$(shell echo $(lib_headers)))
+INTROSPECTION_SCANNER_ARGS = $(REST_CINCLUDES)
 
 girdir = $(datadir)/gir-1.0
 dist_gir_DATA = $(INTROSPECTION_GIRS)
-- 
cgit v1.2.3