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

Revert "g-i: change g-ir-scanner arg --library=libgstfoo-X.la to --library=gstfoo-X"

Browse source 
This reverts commit e39fbe6b7e.

Looks like we need to pass the full .la file after all in a setup
with libtool, or it might not find the library, e.g. like

  ERROR: can't resolve libraries to shared libraries: gstfft-1.0

Conflicts:
	gst-libs/gst/audio/Makefile.am
	gst-libs/gst/pbutils/Makefile.am

Also see https://bugzilla.gnome.org/show_bug.cgi?id=603710
This commit is contained in:
Tim-Philipp Müller 2012-10-29 12:47:05 +00:00
parent 7f22e3ea7f
commit a4f2df6341
10 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/app/Makefile.am
View file

@ -50,7 +50,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
-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@` \
--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-base-@GST_API_VERSION@` \
--library=gstapp-@GST_API_VERSION@ \ --library=libgstapp-@GST_API_VERSION@.la \
--include=Gst-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \
--include=GstBase-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \

2
gst-libs/gst/audio/Makefile.am
View file

@ -98,7 +98,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
--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@` \
--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-base-@GST_API_VERSION@` \
--add-include-path="$(top_builddir)/gst-libs/gst/tag/" \ --add-include-path="$(top_builddir)/gst-libs/gst/tag/" \
--library=gstaudio-@GST_API_VERSION@ \ --library=libgstaudio-@GST_API_VERSION@.la \
--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-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \ --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
--library-path="$(top_builddir)/gst-libs/gst/tag/" \ --library-path="$(top_builddir)/gst-libs/gst/tag/" \

2
gst-libs/gst/fft/Makefile.am
View file

@ -60,7 +60,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO
--warn-all \ --warn-all \
$(gir_cincludes) \ $(gir_cincludes) \
--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=gstfft-@GST_API_VERSION@ \ --library=libgstfft-@GST_API_VERSION@.la \
--include=Gst-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gstreamer-@GST_API_VERSION@ \ --pkg gstreamer-@GST_API_VERSION@ \

2
gst-libs/gst/pbutils/Makefile.am
View file

@ -85,7 +85,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
--add-include-path="$(top_builddir)/gst-libs/gst/tag/" \ --add-include-path="$(top_builddir)/gst-libs/gst/tag/" \
--add-include-path="$(top_builddir)/gst-libs/gst/video/" \ --add-include-path="$(top_builddir)/gst-libs/gst/video/" \
--add-include-path="$(top_builddir)/gst-libs/gst/audio/" \ --add-include-path="$(top_builddir)/gst-libs/gst/audio/" \
--library=gstpbutils-@GST_API_VERSION@ \ --library=libgstpbutils-@GST_API_VERSION@.la \
--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-path="$(top_builddir)/gst-libs/gst/tag/" \ --library-path="$(top_builddir)/gst-libs/gst/tag/" \
--library-path="$(top_builddir)/gst-libs/gst/video/" \ --library-path="$(top_builddir)/gst-libs/gst/video/" \

2
gst-libs/gst/riff/Makefile.am
View file

@ -38,7 +38,7 @@ GstRiff-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_API_VERS
--add-include-path=$(builddir)/../audio \ --add-include-path=$(builddir)/../audio \
--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@` \
--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-base-@GST_API_VERSION@` \
--library=gstriff-@GST_API_VERSION@ \ --library=libgstriff-@GST_API_VERSION@.la \
--include=GstAudio-@GST_API_VERSION@ \ --include=GstAudio-@GST_API_VERSION@ \
--include=GstTag-@GST_API_VERSION@ \ --include=GstTag-@GST_API_VERSION@ \
--include=Gst-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \

2
gst-libs/gst/rtp/Makefile.am
View file

@ -38,7 +38,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/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@` \
--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-base-@GST_API_VERSION@` \
--library=gstrtp-@GST_API_VERSION@ \ --library=libgstrtp-@GST_API_VERSION@.la \
--include=Gst-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \
--include=GstBase-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \

2
gst-libs/gst/rtsp/Makefile.am
View file

@ -69,7 +69,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
--add-include-path=$(builddir)/../sdp \ --add-include-path=$(builddir)/../sdp \
--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=gstrtsp-@GST_API_VERSION@ \ --library=libgstrtsp-@GST_API_VERSION@.la \
--include=Gio-2.0 \ --include=Gio-2.0 \
--include=Gst-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \
--include=GstSdp-@GST_API_VERSION@ \ --include=GstSdp-@GST_API_VERSION@ \

2
gst-libs/gst/sdp/Makefile.am
View file

@ -28,7 +28,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
$(gir_cincludes) \ $(gir_cincludes) \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/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=gstsdp-@GST_API_VERSION@ \ --library=libgstsdp-@GST_API_VERSION@.la \
--include=Gst-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gstreamer-@GST_API_VERSION@ \ --pkg gstreamer-@GST_API_VERSION@ \

2
gst-libs/gst/tag/Makefile.am
View file

@ -40,7 +40,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
$(gir_cincludes) \ $(gir_cincludes) \
--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@` \
--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-base-@GST_API_VERSION@` \
--library=gsttag-@GST_API_VERSION@ \ --library=libgsttag-@GST_API_VERSION@.la \
--include=Gst-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \
--include=GstBase-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \

2
gst-libs/gst/video/Makefile.am
View file

@ -95,7 +95,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
-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@` \
--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-base-@GST_API_VERSION@` \
--library=gstvideo-@GST_API_VERSION@ \ --library=libgstvideo-@GST_API_VERSION@.la \
--include=Gst-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \
--include=GstBase-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \