Commit 1328a44a authored by David Waring's avatar David Waring Committed by Tim-Philipp Müller
Browse files

libs: player: use configured GST_PKG_CONFIG_PATH when invoking the introspection scanner

https://bugzilla.gnome.org/show_bug.cgi?id=761460
parent 36125a84
......@@ -57,7 +57,8 @@ gir_headers=$(patsubst %,$(srcdir)/%, $(libgstplayer_HEADERS))
gir_sources=$(patsubst %,$(srcdir)/%, $(libgstplayer_@GST_API_VERSION@_la_SOURCES))
GstPlayer-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstplayer-@GST_API_VERSION@.la
$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v --namespace GstPlayer \
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
$(INTROSPECTION_SCANNER) -v --namespace GstPlayer \
--nsversion=@GST_API_VERSION@ \
--warn-all \
--strip-prefix=Gst \
......@@ -65,7 +66,7 @@ GstPlayer-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstplayer-@GST_API_
-I$(top_builddir)/gst-libs \
--c-include "gst/player/player.h" \
--add-include-path=$(top_builddir)/gst-libs \
--add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-1.0` \
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-1.0` \
--library-path=$(top_builddir)/gst-libs \
--library=libgstplayer-@GST_API_VERSION@.la \
--include=Gst-@GST_API_VERSION@ \
......@@ -91,10 +92,11 @@ typelibsdir = $(libdir)/girepository-1.0/
typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
%.typelib: %.gir $(INTROSPECTION_COMPILER)
$(AM_V_GEN)$(INTROSPECTION_COMPILER) \
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
$(INTROSPECTION_COMPILER) \
--includedir=$(srcdir)/gst-libs \
--includedir=$(builddir)/gst-libs \
--includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-1.0` \
--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-1.0` \
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
......
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