mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-02 16:52:42 +00:00
pbutils: try harder to make g-i use the build-tree libgsttag,-audio, and -video
without adding additional --library= tags, which shouldn't be there. https://bugzilla.gnome.org/show_bug.cgi?id=679315
This commit is contained in:
parent
e39fbe6b7e
commit
9453d7c287
1 changed files with 16 additions and 4 deletions
|
@ -82,15 +82,23 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
|
||||||
-I$(top_srcdir)/gst-libs \
|
-I$(top_srcdir)/gst-libs \
|
||||||
-I$(top_builddir)/gst-libs \
|
-I$(top_builddir)/gst-libs \
|
||||||
--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-@GST_API_VERSION@` \
|
||||||
--library=$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la \
|
--add-include-path="$(top_builddir)/gst-libs/gst/tag/" \
|
||||||
--library=$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \
|
--add-include-path="$(top_builddir)/gst-libs/gst/video/" \
|
||||||
--library=$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
|
--add-include-path="$(top_builddir)/gst-libs/gst/audio/" \
|
||||||
--library=gstpbutils-@GST_API_VERSION@ \
|
--library=gstpbutils-@GST_API_VERSION@ \
|
||||||
--library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
|
--library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
|
||||||
--library=gstreamer-@GST_API_VERSION@ \
|
--library-path="$(top_builddir)/gst-libs/gst/tag/" \
|
||||||
|
--library-path="$(top_builddir)/gst-libs/gst/video/" \
|
||||||
|
--library-path="$(top_builddir)/gst-libs/gst/audio/" \
|
||||||
--include=Gst-@GST_API_VERSION@ \
|
--include=Gst-@GST_API_VERSION@ \
|
||||||
|
--include=GstTag-@GST_API_VERSION@ \
|
||||||
|
--include=GstVideo-@GST_API_VERSION@ \
|
||||||
|
--include=GstAudio-@GST_API_VERSION@ \
|
||||||
--libtool="$(top_builddir)/libtool" \
|
--libtool="$(top_builddir)/libtool" \
|
||||||
--pkg gstreamer-@GST_API_VERSION@ \
|
--pkg gstreamer-@GST_API_VERSION@ \
|
||||||
|
--pkg gstreamer-tag-@GST_API_VERSION@ \
|
||||||
|
--pkg gstreamer-video-@GST_API_VERSION@ \
|
||||||
|
--pkg gstreamer-audio-@GST_API_VERSION@ \
|
||||||
--pkg-export gstreamer-pbutils-@GST_API_VERSION@ \
|
--pkg-export gstreamer-pbutils-@GST_API_VERSION@ \
|
||||||
--add-init-section="gst_init(NULL,NULL);" \
|
--add-init-section="gst_init(NULL,NULL);" \
|
||||||
--output $@ \
|
--output $@ \
|
||||||
|
@ -112,6 +120,10 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
||||||
--includedir=$(srcdir) \
|
--includedir=$(srcdir) \
|
||||||
--includedir=$(builddir) \
|
--includedir=$(builddir) \
|
||||||
--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-@GST_API_VERSION@` \
|
||||||
|
--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
|
||||||
|
--includedir="$(top_builddir)/gst-libs/gst/tag/" \
|
||||||
|
--includedir="$(top_builddir)/gst-libs/gst/video/" \
|
||||||
|
--includedir="$(top_builddir)/gst-libs/gst/audio/" \
|
||||||
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
||||||
|
|
||||||
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
||||||
|
|
Loading…
Reference in a new issue