| From f1d9652351e7754c63003104eceb526af424c7e0 Mon Sep 17 00:00:00 2001 |
| From: Alexander Kanavin <alex.kanavin@gmail.com> |
| Date: Fri, 20 Nov 2015 16:53:04 +0200 |
| Subject: [PATCH 1/4] Makefile.am: don't hardcode libtool name when running |
| introspection tools |
| |
| Upstream-Status: Pending [review on oe-core maillist] |
| Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| --- |
| gst-libs/gst/allocators/Makefile.am | 2 +- |
| 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 +- |
| 11 files changed, 11 insertions(+), 11 deletions(-) |
| |
| diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am |
| index 9361bf9..bc7f53a 100644 |
| --- a/gst-libs/gst/allocators/Makefile.am |
| +++ b/gst-libs/gst/allocators/Makefile.am |
| @@ -38,7 +38,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ |
| --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
| --library=libgstallocators-@GST_API_VERSION@.la \ |
| --include=Gst-@GST_API_VERSION@ \ |
| - --libtool="$(top_builddir)/libtool" \ |
| + --libtool="$(LIBTOOL)" \ |
| --pkg gstreamer-@GST_API_VERSION@ \ |
| --pkg-export gstreamer-allocators-@GST_API_VERSION@ \ |
| --output $@ \ |
| diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am |
| index 6d6de8d..dcc2fe0 100644 |
| --- a/gst-libs/gst/app/Makefile.am |
| +++ b/gst-libs/gst/app/Makefile.am |
| @@ -53,7 +53,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO |
| --library=libgstapp-@GST_API_VERSION@.la \ |
| --include=Gst-@GST_API_VERSION@ \ |
| --include=GstBase-@GST_API_VERSION@ \ |
| - --libtool="$(top_builddir)/libtool" \ |
| + --libtool="$(LIBTOOL)" \ |
| --pkg gstreamer-@GST_API_VERSION@ \ |
| --pkg gstreamer-base-@GST_API_VERSION@ \ |
| --pkg-export gstreamer-app-@GST_API_VERSION@ \ |
| diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am |
| index 275d222..2374196 100644 |
| --- a/gst-libs/gst/audio/Makefile.am |
| +++ b/gst-libs/gst/audio/Makefile.am |
| @@ -116,7 +116,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE |
| --include=Gst-@GST_API_VERSION@ \ |
| --include=GstBase-@GST_API_VERSION@ \ |
| --include=GstTag-@GST_API_VERSION@ \ |
| - --libtool="$(top_builddir)/libtool" \ |
| + --libtool="$(LIBTOOL)" \ |
| --pkg gstreamer-@GST_API_VERSION@ \ |
| --pkg gstreamer-base-@GST_API_VERSION@ \ |
| --pkg-export gstreamer-audio-@GST_API_VERSION@ \ |
| diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am |
| index 09b3d68..f545354 100644 |
| --- a/gst-libs/gst/fft/Makefile.am |
| +++ b/gst-libs/gst/fft/Makefile.am |
| @@ -65,7 +65,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO |
| --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
| --library=libgstfft-@GST_API_VERSION@.la \ |
| --include=Gst-@GST_API_VERSION@ \ |
| - --libtool="$(top_builddir)/libtool" \ |
| + --libtool="$(LIBTOOL)" \ |
| --pkg gstreamer-@GST_API_VERSION@ \ |
| --pkg-export gstreamer-fft-@GST_API_VERSION@ \ |
| --output $@ \ |
| diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am |
| index 64d5eb0..91dc214 100644 |
| --- a/gst-libs/gst/pbutils/Makefile.am |
| +++ b/gst-libs/gst/pbutils/Makefile.am |
| @@ -99,7 +99,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP |
| --include=GstTag-@GST_API_VERSION@ \ |
| --include=GstVideo-@GST_API_VERSION@ \ |
| --include=GstAudio-@GST_API_VERSION@ \ |
| - --libtool="$(top_builddir)/libtool" \ |
| + --libtool="$(LIBTOOL)" \ |
| --pkg gstreamer-@GST_API_VERSION@ \ |
| --pkg gstreamer-tag-@GST_API_VERSION@ \ |
| --pkg gstreamer-video-@GST_API_VERSION@ \ |
| diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am |
| index 83d83cb..3bd8fc0 100644 |
| --- a/gst-libs/gst/riff/Makefile.am |
| +++ b/gst-libs/gst/riff/Makefile.am |
| @@ -47,7 +47,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) |
| # --include=GstAudio-@GST_API_VERSION@ \ |
| # --include=GstTag-@GST_API_VERSION@ \ |
| # --include=Gst-@GST_API_VERSION@ \ |
| -# --libtool="$(top_builddir)/libtool" \ |
| +# --libtool="$(LIBTOOL)" \ |
| # --pkg gstreamer-@GST_API_VERSION@ \ |
| # --pkg gstreamer-tag-@GST_API_VERSION@ \ |
| # --pkg gstreamer-audio-@GST_API_VERSION@ \ |
| diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am |
| index fdd01c1..f5445c1 100644 |
| --- a/gst-libs/gst/rtp/Makefile.am |
| +++ b/gst-libs/gst/rtp/Makefile.am |
| @@ -65,7 +65,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO |
| --library=libgstrtp-@GST_API_VERSION@.la \ |
| --include=Gst-@GST_API_VERSION@ \ |
| --include=GstBase-@GST_API_VERSION@ \ |
| - --libtool="$(top_builddir)/libtool" \ |
| + --libtool="$(LIBTOOL)" \ |
| --pkg gstreamer-@GST_API_VERSION@ \ |
| --pkg gstreamer-base-@GST_API_VERSION@ \ |
| --pkg-export gstreamer-rtp-@GST_API_VERSION@ \ |
| diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am |
| index ede5706..9b0b258 100644 |
| --- a/gst-libs/gst/rtsp/Makefile.am |
| +++ b/gst-libs/gst/rtsp/Makefile.am |
| @@ -72,7 +72,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS |
| --include=Gio-2.0 \ |
| --include=Gst-@GST_API_VERSION@ \ |
| --include=GstSdp-@GST_API_VERSION@ \ |
| - --libtool="$(top_builddir)/libtool" \ |
| + --libtool="$(LIBTOOL)" \ |
| --pkg gio-2.0 \ |
| --pkg gstreamer-@GST_API_VERSION@ \ |
| --pkg gstreamer-sdp-@GST_API_VERSION@ \ |
| diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am |
| index a90f30b..0e149b8 100644 |
| --- a/gst-libs/gst/sdp/Makefile.am |
| +++ b/gst-libs/gst/sdp/Makefile.am |
| @@ -32,7 +32,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO |
| --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
| --library=libgstsdp-@GST_API_VERSION@.la \ |
| --include=Gst-@GST_API_VERSION@ \ |
| - --libtool="$(top_builddir)/libtool" \ |
| + --libtool="$(LIBTOOL)" \ |
| --pkg gstreamer-@GST_API_VERSION@ \ |
| --pkg-export gstreamer-sdp-@GST_API_VERSION@ \ |
| --output $@ \ |
| diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am |
| index c534a4d..cafafd3 100644 |
| --- a/gst-libs/gst/tag/Makefile.am |
| +++ b/gst-libs/gst/tag/Makefile.am |
| @@ -45,7 +45,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO |
| --library=libgsttag-@GST_API_VERSION@.la \ |
| --include=Gst-@GST_API_VERSION@ \ |
| --include=GstBase-@GST_API_VERSION@ \ |
| - --libtool="$(top_builddir)/libtool" \ |
| + --libtool="$(LIBTOOL)" \ |
| --pkg gstreamer-@GST_API_VERSION@ \ |
| --pkg gstreamer-base-@GST_API_VERSION@ \ |
| --pkg-export gstreamer-tag-@GST_API_VERSION@ \ |
| diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am |
| index 5d31fa1..ac64eb3 100644 |
| --- a/gst-libs/gst/video/Makefile.am |
| +++ b/gst-libs/gst/video/Makefile.am |
| @@ -116,7 +116,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE |
| --library=libgstvideo-@GST_API_VERSION@.la \ |
| --include=Gst-@GST_API_VERSION@ \ |
| --include=GstBase-@GST_API_VERSION@ \ |
| - --libtool="$(top_builddir)/libtool" \ |
| + --libtool="$(LIBTOOL)" \ |
| --pkg gstreamer-@GST_API_VERSION@ \ |
| --pkg gstreamer-base-@GST_API_VERSION@ \ |
| --pkg-export gstreamer-video-@GST_API_VERSION@ \ |
| -- |
| 2.6.2 |
| |