mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=761460
This commit is contained in:
David Waring 2016-02-02 14:46:30 +00:00 committed by Tim-Philipp Müller
parent 36125a844d
commit 1328a44a01
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst-libs/gst/player/Makefile.am
View file

@ -57,7 +57,8 @@ gir_headers=$(patsubst %,$(srcdir)/%, $(libgstplayer_HEADERS))
gir_sources=$(patsubst %,$(srcdir)/%, $(libgstplayer_@GST_API_VERSION@_la_SOURCES)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstplayer_@GST_API_VERSION@_la_SOURCES))
GstPlayer-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstplayer-@GST_API_VERSION@.la 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@ \ --nsversion=@GST_API_VERSION@ \
--warn-all \ --warn-all \
--strip-prefix=Gst \ --strip-prefix=Gst \
@ -65,7 +66,7 @@ GstPlayer-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstplayer-@GST_API_
-I$(top_builddir)/gst-libs \ -I$(top_builddir)/gst-libs \
--c-include "gst/player/player.h" \ --c-include "gst/player/player.h" \
--add-include-path=$(top_builddir)/gst-libs \ --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-path=$(top_builddir)/gst-libs \
--library=libgstplayer-@GST_API_VERSION@.la \ --library=libgstplayer-@GST_API_VERSION@.la \
--include=Gst-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \
@ -91,10 +92,11 @@ typelibsdir = $(libdir)/girepository-1.0/
typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
%.typelib: %.gir $(INTROSPECTION_COMPILER) %.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=$(srcdir)/gst-libs \
--includedir=$(builddir)/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) $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)