[gst-cvs] gst-plugins-base: build: Fix include path order for gir generation

[Tim Müller]

Module: gst-plugins-base
Branch: master
Commit: 33e6fe44b295ae00a51d7ae03366fc84775ed7a8
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=33e6fe44b295ae00a51d7ae03366fc84775ed7a8

Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Mon Oct  4 13:25:14 2010 +0530

build: Fix include path order for gir generation

This makes sure that the built girs are picked up over installed girs
where this is currently the case.

---

 gst-libs/gst/cdda/Makefile.am    |    2 +-
 gst-libs/gst/pbutils/Makefile.am |    2 +-
 gst-libs/gst/riff/Makefile.am    |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gst-libs/gst/cdda/Makefile.am b/gst-libs/gst/cdda/Makefile.am
index 65aef79..c189cea 100644
--- a/gst-libs/gst/cdda/Makefile.am
+++ b/gst-libs/gst/cdda/Makefile.am
@@ -28,9 +28,9 @@ GstCdda- at GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcdda- at GST_MAJORMINO
 		--nsversion=@GST_MAJORMINOR@ \
 		--strip-prefix=Gst \
 		$(gir_cincludes) \
+		--add-include-path=$(builddir)/../tag \
 		--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
 		--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
-		--add-include-path=$(builddir)/../tag \
 		--library=libgstcdda-0.10.la \
 		--include=Gst-0.10 \
 		--include=GstBase-0.10 \
diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
index 1d3d092..d618255 100644
--- a/gst-libs/gst/pbutils/Makefile.am
+++ b/gst-libs/gst/pbutils/Makefile.am
@@ -82,8 +82,8 @@ GstPbutils- at GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstpbutils- at GST_MAJ
 		$(gir_cincludes) \
 		-I$(top_srcdir)/gst-libs \
 		-I$(top_builddir)/gst-libs \
-		--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
 		--add-include-path=$(srcdir)/../video \
+		--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
 		--library=libgstpbutils-0.10.la \
 		--include=Gst-0.10 \
 		--libtool="$(top_builddir)/libtool" \
diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
index 4957a4f..44e1384 100644
--- a/gst-libs/gst/riff/Makefile.am
+++ b/gst-libs/gst/riff/Makefile.am
@@ -32,11 +32,11 @@ GstRiff- at GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstriff- at GST_MAJORMINO
 		--nsversion=@GST_MAJORMINOR@ \
 		--strip-prefix=Gst \
 		$(gir_cincludes) \
-		--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
-		--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
 		--add-include-path=$(builddir)/../tag \
 		--add-include-path=$(builddir)/../audio \
 		--add-include-path=$(builddir)/../interfaces \
+		--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
+		--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
 		--library=libgstriff-0.10.la \
 		--include=GstAudio-0.10 \
 		--include=GstTag-0.10 \