From e39fbe6b7e14ccccbf47a5726a18eb963535063b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 28 Oct 2012 17:34:59 +0000 Subject: [PATCH] g-i: change g-ir-scanner arg --library=libgstfoo-X.la to --library=gstfoo-X As it should be according to the man page. https://bugzilla.gnome.org/show_bug.cgi?id=679315 --- gst-libs/gst/app/Makefile.am | 2 +- gst-libs/gst/audio/Makefile.am | 2 +- gst-libs/gst/fft/Makefile.am | 2 +- gst-libs/gst/pbutils/Makefile.am | 2 +- gst-libs/gst/riff/Makefile.am | 2 +- gst-libs/gst/rtp/Makefile.am | 2 +- gst-libs/gst/rtsp/Makefile.am | 2 +- gst-libs/gst/sdp/Makefile.am | 2 +- gst-libs/gst/tag/Makefile.am | 2 +- gst-libs/gst/video/Makefile.am | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am index 46170fb..2a34dea 100644 --- a/gst-libs/gst/app/Makefile.am +++ b/gst-libs/gst/app/Makefile.am @@ -50,7 +50,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO -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-base-@GST_API_VERSION@` \ - --library=libgstapp-@GST_API_VERSION@.la \ + --library=gstapp-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index 077dd53..4c6e710 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -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-base-@GST_API_VERSION@` \ --library=$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la \ - --library=libgstaudio-@GST_API_VERSION@.la \ + --library=gstaudio-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am index 94255c8..3f69c27 100644 --- a/gst-libs/gst/fft/Makefile.am +++ b/gst-libs/gst/fft/Makefile.am @@ -60,7 +60,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO --warn-all \ $(gir_cincludes) \ --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - --library=libgstfft-@GST_API_VERSION@.la \ + --library=gstfft-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ --pkg gstreamer-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am index dacbb02..2597c1f 100644 --- a/gst-libs/gst/pbutils/Makefile.am +++ b/gst-libs/gst/pbutils/Makefile.am @@ -85,7 +85,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP --library=$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la \ --library=$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \ --library=$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \ - --library=libgstpbutils-@GST_API_VERSION@.la \ + --library=gstpbutils-@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@ \ --include=Gst-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am index 7ab6863..5468a9b 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am @@ -38,7 +38,7 @@ GstRiff-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_API_VERS --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-base-@GST_API_VERSION@` \ - --library=libgstriff-@GST_API_VERSION@.la \ + --library=gstriff-@GST_API_VERSION@ \ --include=GstAudio-@GST_API_VERSION@ \ --include=GstTag-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am index fc65d52..a03457c 100644 --- a/gst-libs/gst/rtp/Makefile.am +++ b/gst-libs/gst/rtp/Makefile.am @@ -38,7 +38,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO -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-base-@GST_API_VERSION@` \ - --library=libgstrtp-@GST_API_VERSION@.la \ + --library=gstrtp-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am index 9b5772a..c7d6d0b 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am @@ -69,7 +69,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS -I$(top_srcdir)/gst-libs \ --add-include-path=$(builddir)/../sdp \ --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - --library=libgstrtsp-@GST_API_VERSION@.la \ + --library=gstrtsp-@GST_API_VERSION@ \ --include=Gio-2.0 \ --include=Gst-@GST_API_VERSION@ \ --include=GstSdp-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am index 43948c4..a994a97 100644 --- a/gst-libs/gst/sdp/Makefile.am +++ b/gst-libs/gst/sdp/Makefile.am @@ -28,7 +28,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO $(gir_cincludes) \ -I$(top_srcdir)/gst-libs \ --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - --library=libgstsdp-@GST_API_VERSION@.la \ + --library=gstsdp-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ --pkg gstreamer-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am index 2358f19..79f2ccc 100644 --- a/gst-libs/gst/tag/Makefile.am +++ b/gst-libs/gst/tag/Makefile.am @@ -40,7 +40,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO $(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-base-@GST_API_VERSION@` \ - --library=libgsttag-@GST_API_VERSION@.la \ + --library=gsttag-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index f1ecbeb..80797ad 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -95,7 +95,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE -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-base-@GST_API_VERSION@` \ - --library=libgstvideo-@GST_API_VERSION@.la \ + --library=gstvideo-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ --libtool="$(top_builddir)/libtool" \ -- 2.7.4