gl: pick up GstVideo-1.0.gir from local build dir

https://bugzilla.gnome.org/show_bug.cgi?id=794708

diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
index a3bbc94..2df0385 100644 (file)
--- a/gst-libs/gst/gl/Makefile.am
+++ b/gst-libs/gst/gl/Makefile.am
@@ -185,9 +185,10 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
                -I$(top_builddir)/gst-libs \
                $(GST_PLUGINS_BASE_CFLAGS) \
                $(GL_CFLAGS) \
+               --add-include-path="$(top_builddir)/gst-libs/gst/video/" \
                --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
                --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
-               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
+               --library-path="$(top_builddir)/gst-libs/gst/video/" \
                --library=libgstgl-@GST_API_VERSION@.la \
                --include=Gst-@GST_API_VERSION@ \
                --include=GstBase-@GST_API_VERSION@ \
@@ -216,9 +217,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
                $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
+               --includedir="$(top_builddir)/gst-libs/gst/video/" \
                --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
                --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
-               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)