[clutter-gst] clutter-gst: fix g-i scanning/compiling in an uninstalled GStreamer setup

[Edward Hervey <edwardrv src gnome org>]

commit 5c35847aa5648695db717aec54d44e54e77063c1
Author: Tim-Philipp MÃller <tim muller collabora co uk>
Date:   Wed Jul 11 17:51:30 2012 +0100

    clutter-gst: fix g-i scanning/compiling in an uninstalled GStreamer setup

 clutter-gst/Makefile.am |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am
index f25640f..9a0f7d6 100644
--- a/clutter-gst/Makefile.am
+++ b/clutter-gst/Makefile.am
@@ -133,9 +133,13 @@ ClutterGst- CLUTTER_GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-gs
 		--c-include="clutter-gst/clutter-gst.h" \
 		--include=GObject-2.0 \
 		--include=Clutter-1.0 \
+		--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer- CLUTTER_GST_API_VERSION@` \
 		--include=Gst-1.0 \
+		--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base- CLUTTER_GST_API_VERSION@` \
 		--include=GstBase-1.0 \
+		--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-video- CLUTTER_GST_API_VERSION@` \
 		--include=GstVideo-1.0 \
+		--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-audio- CLUTTER_GST_API_VERSION@` \
 		--include=GstAudio-1.0 \
 		--add-init-section="clutter_gst_init(0,NULL);" \
 		--library=libclutter-gst- CLUTTER_GST_API_VERSION@.la \
@@ -160,7 +164,14 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-	$(QUIET_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
+	$(QUIET_GEN)$(INTROSPECTION_COMPILER) \
+		--includedir=$(srcdir) \
+		--includedir=. \
+		--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer- CLUTTER_GST_API_VERSION@` \
+		--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base- CLUTTER_GST_API_VERSION@` \
+		--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-video- CLUTTER_GST_API_VERSION@` \
+		--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-audio- CLUTTER_GST_API_VERSION@` \
+		$(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif