Commit 33e6fe44 authored by Arun Raghavan's avatar Arun Raghavan Committed by Tim-Philipp Müller
Browse files

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.
parent 719a9f57
...@@ -28,9 +28,9 @@ GstCdda-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcdda-@GST_MAJORMINO ...@@ -28,9 +28,9 @@ GstCdda-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcdda-@GST_MAJORMINO
--nsversion=@GST_MAJORMINOR@ \ --nsversion=@GST_MAJORMINOR@ \
--strip-prefix=Gst \ --strip-prefix=Gst \
$(gir_cincludes) \ $(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-0.10` \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \ --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
--add-include-path=$(builddir)/../tag \
--library=libgstcdda-0.10.la \ --library=libgstcdda-0.10.la \
--include=Gst-0.10 \ --include=Gst-0.10 \
--include=GstBase-0.10 \ --include=GstBase-0.10 \
......
...@@ -82,8 +82,8 @@ GstPbutils-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_MAJ ...@@ -82,8 +82,8 @@ GstPbutils-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_MAJ
$(gir_cincludes) \ $(gir_cincludes) \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
-I$(top_builddir)/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=$(srcdir)/../video \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
--library=libgstpbutils-0.10.la \ --library=libgstpbutils-0.10.la \
--include=Gst-0.10 \ --include=Gst-0.10 \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
......
...@@ -32,11 +32,11 @@ GstRiff-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_MAJORMINO ...@@ -32,11 +32,11 @@ GstRiff-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_MAJORMINO
--nsversion=@GST_MAJORMINOR@ \ --nsversion=@GST_MAJORMINOR@ \
--strip-prefix=Gst \ --strip-prefix=Gst \
$(gir_cincludes) \ $(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)/../tag \
--add-include-path=$(builddir)/../audio \ --add-include-path=$(builddir)/../audio \
--add-include-path=$(builddir)/../interfaces \ --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 \ --library=libgstriff-0.10.la \
--include=GstAudio-0.10 \ --include=GstAudio-0.10 \
--include=GstTag-0.10 \ --include=GstTag-0.10 \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment