mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 16:26:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

build: Fix include path order for gir generation

Browse source 
This makes sure that the built girs are picked up over installed girs
where this is currently the case.
This commit is contained in:
Arun Raghavan 2010-10-04 13:07:14 +05:30 committed by Tim-Philipp Müller
parent 719a9f5739
commit 33e6fe44b2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/cdda/Makefile.am
View file

@ -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 \

2
gst-libs/gst/pbutils/Makefile.am
View file

@ -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" \

4
gst-libs/gst/riff/Makefile.am
View file

@ -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 \