mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-08 23:55:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: fix PKG_CONFIG_PATH used when calling gobject-introspection scanner

Browse source 
Our own pkgconfig directory should come first, so that pkg-config uses
the in-tree libgstreamer and not some external one when --pkg=gstreamer-0.10
is passed to g-ir-scanner.

See #603710.
This commit is contained in:
Tim-Philipp Müller 2010-03-25 13:46:35 +00:00
parent 7a8004233a
commit 8cc7274163
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/gst/base/Makefile.am
View file

@ -53,7 +53,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_MAJORMINOR@_la_SOURCES))
gir_cincludes=$(patsubst %,--c-include='gst/base/%',$(libgstbase_@GST_MAJORMINOR@include_HEADERS))
GstBase-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_MAJORMINOR@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
$(AM_V_GEN)PKG_CONFIG_PATH="$(top_builddir)/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" \
$(INTROSPECTION_SCANNER) -v --namespace GstBase \
--nsversion=@GST_MAJORMINOR@ \
--strip-prefix=Gst \

2
libs/gst/check/Makefile.am
View file

@ -111,7 +111,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcheck_@GST_MAJORMINOR@_la_SOURCES)
gir_cincludes=$(patsubst %,--c-include='gst/check/%',$(libgstcheck_@GST_MAJORMINOR@include_HEADERS))
GstCheck-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_MAJORMINOR@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
$(AM_V_GEN)PKG_CONFIG_PATH="$(top_builddir)/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" \
$(INTROSPECTION_SCANNER) -v --namespace GstCheck \
--nsversion=@GST_MAJORMINOR@ \
--strip-prefix=Gst \

2
libs/gst/controller/Makefile.am
View file

@ -40,7 +40,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcontroller_@GST_MAJORMINOR@_la_SOU
gir_cincludes=$(patsubst %,--c-include='gst/controller/%',$(libgstcontroller_@GST_MAJORMINOR@_include_HEADERS))
GstController-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@GST_MAJORMINOR@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
$(AM_V_GEN)PKG_CONFIG_PATH="$(top_builddir)/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" \
$(INTROSPECTION_SCANNER) -v --namespace GstController \
--nsversion=@GST_MAJORMINOR@ \
--strip-prefix=Gst \

2
libs/gst/dataprotocol/Makefile.am
View file

@ -30,7 +30,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstdataprotocol_@GST_MAJORMINOR@_la_S
gir_cincludes=$(patsubst %,--c-include='gst/dataprotocol/%',$(libgstdataprotocol_@GST_MAJORMINOR@_include_HEADERS))
GstDataprotocol-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstdataprotocol-@GST_MAJORMINOR@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
$(AM_V_GEN)PKG_CONFIG_PATH="$(top_builddir)/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" \
$(INTROSPECTION_SCANNER) -v --namespace GstDataprotocol \
--strip-prefix=Gst \
--nsversion=@GST_MAJORMINOR@ \

2
libs/gst/net/Makefile.am
View file

@ -31,7 +31,7 @@ gir_sources=$(patsubst %,$(srcdir)/%, $(libgstnet_@GST_MAJORMINOR@_la_SOURCES))
gir_cincludes=$(patsubst %,--c-include='gst/net/%',$(libgstbase_@GST_MAJORMINOR@_include_HEADERS))
GstNet-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_MAJORMINOR@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(top_builddir)/pkgconfig" \
$(AM_V_GEN)PKG_CONFIG_PATH="$(top_builddir)/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" \
$(INTROSPECTION_SCANNER) -v --namespace GstNet \
--strip-prefix=Gst \
--nsversion=@GST_MAJORMINOR@ \