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.

diff --git a/gst-libs/gst/cdda/Makefile.am b/gst-libs/gst/cdda/Makefile.am
index 65aef79..c189cea 100644 (file)
--- a/gst-libs/gst/cdda/Makefile.am
+++ b/gst-libs/gst/cdda/Makefile.am
@@ -28,9 +28,9 @@ GstCdda-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcdda-@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 (file)
--- a/gst-libs/gst/pbutils/Makefile.am
+++ b/gst-libs/gst/pbutils/Makefile.am
@@ -82,8 +82,8 @@ GstPbutils-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@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 (file)
--- a/gst-libs/gst/riff/Makefile.am
+++ b/gst-libs/gst/riff/Makefile.am
@@ -32,11 +32,11 @@ GstRiff-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstriff-@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 \