mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-08 23:55:55 +00:00
libs: fix PKG_CONFIG_PATH used when calling gobject-introspection scanner
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:
parent
7a8004233a
commit
8cc7274163
|
@ -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 \
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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@ \
|
||||
|
|
|
@ -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@ \
|
||||
|
|
Loading…
Reference in a new issue