You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
181 lines
8.0 KiB
181 lines
8.0 KiB
7 years ago
|
From 0c5843296bece8c298d5c8ca7342835f9fa9cbd6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||
|
|
Date: Sat, 19 Nov 2016 10:26:10 +0100
|
||
|
|
Subject: [PATCH] [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>
|
||
|
|
|
||
|
|
modified: gst-libs/gst/allocators/Makefile.am
|
||
|
|
modified: gst-libs/gst/app/Makefile.am
|
||
|
|
modified: gst-libs/gst/audio/Makefile.am
|
||
|
|
modified: gst-libs/gst/fft/Makefile.am
|
||
|
|
modified: gst-libs/gst/pbutils/Makefile.am
|
||
|
|
modified: gst-libs/gst/riff/Makefile.am
|
||
|
|
modified: gst-libs/gst/rtp/Makefile.am
|
||
|
|
modified: gst-libs/gst/rtsp/Makefile.am
|
||
|
|
modified: gst-libs/gst/sdp/Makefile.am
|
||
|
|
modified: gst-libs/gst/tag/Makefile.am
|
||
|
|
modified: gst-libs/gst/video/Makefile.am
|
||
|
|
---
|
||
|
|
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 bccfdb3..c3a1cb8 100644
|
||
|
|
--- a/gst-libs/gst/allocators/Makefile.am
|
||
|
|
+++ b/gst-libs/gst/allocators/Makefile.am
|
||
|
|
@@ -39,7 +39,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 0033371..1869540 100644
|
||
|
|
--- a/gst-libs/gst/app/Makefile.am
|
||
|
|
+++ b/gst-libs/gst/app/Makefile.am
|
||
|
|
@@ -42,7 +42,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 41f9c4d..c39c529 100644
|
||
|
|
--- a/gst-libs/gst/audio/Makefile.am
|
||
|
|
+++ b/gst-libs/gst/audio/Makefile.am
|
||
|
|
@@ -174,7 +174,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 0d70422..2ded9ee 100644
|
||
|
|
--- a/gst-libs/gst/fft/Makefile.am
|
||
|
|
+++ b/gst-libs/gst/fft/Makefile.am
|
||
|
|
@@ -66,7 +66,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 c5a25ca..44be19b 100644
|
||
|
|
--- a/gst-libs/gst/pbutils/Makefile.am
|
||
|
|
+++ b/gst-libs/gst/pbutils/Makefile.am
|
||
|
|
@@ -100,7 +100,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 5fa26e5..1cf0590 100644
|
||
|
|
--- a/gst-libs/gst/riff/Makefile.am
|
||
|
|
+++ b/gst-libs/gst/riff/Makefile.am
|
||
|
|
@@ -48,7 +48,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 04b1f90..85085dc 100644
|
||
|
|
--- a/gst-libs/gst/rtp/Makefile.am
|
||
|
|
+++ b/gst-libs/gst/rtp/Makefile.am
|
||
|
|
@@ -66,7 +66,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 88f0853..92b5e81 100644
|
||
|
|
--- a/gst-libs/gst/rtsp/Makefile.am
|
||
|
|
+++ b/gst-libs/gst/rtsp/Makefile.am
|
||
|
|
@@ -73,7 +73,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 6fd9693..e356b16 100644
|
||
|
|
--- a/gst-libs/gst/sdp/Makefile.am
|
||
|
|
+++ b/gst-libs/gst/sdp/Makefile.am
|
||
|
|
@@ -33,7 +33,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 c0c2d6b..490ed40 100644
|
||
|
|
--- a/gst-libs/gst/tag/Makefile.am
|
||
|
|
+++ b/gst-libs/gst/tag/Makefile.am
|
||
|
|
@@ -46,7 +46,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 64f4978..f3ea4ea 100644
|
||
|
|
--- a/gst-libs/gst/video/Makefile.am
|
||
|
|
+++ b/gst-libs/gst/video/Makefile.am
|
||
|
|
@@ -121,7 +121,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.7.4
|
||
|
|
|