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.
72 lines
3.1 KiB
72 lines
3.1 KiB
7 years ago
|
From ae7f7f6f53a264cabe324a3810599a66b357d3f2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||
|
|
Date: Sat, 19 Nov 2016 11:07:55 +0100
|
||
|
|
Subject: [PATCH] [PATCH] Makefile.am: don't hardcode libtool name when running
|
||
|
|
introspection tools
|
||
|
|
|
||
|
|
Upstream-Status: Pending [review on oe-core list]
|
||
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||
|
|
|
||
|
|
modified: gst-libs/gst/gl/Makefile.am
|
||
|
|
modified: gst-libs/gst/insertbin/Makefile.am
|
||
|
|
modified: gst-libs/gst/mpegts/Makefile.am
|
||
|
|
---
|
||
|
|
gst-libs/gst/gl/Makefile.am | 2 +-
|
||
|
|
gst-libs/gst/insertbin/Makefile.am | 2 +-
|
||
|
|
gst-libs/gst/mpegts/Makefile.am | 2 +-
|
||
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
|
||
|
|
index 68cc619..1ff5511 100644
|
||
|
|
--- a/gst-libs/gst/gl/Makefile.am
|
||
|
|
+++ b/gst-libs/gst/gl/Makefile.am
|
||
|
|
@@ -172,7 +172,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
|
||
|
|
--include=Gst-@GST_API_VERSION@ \
|
||
|
|
--include=GstBase-@GST_API_VERSION@ \
|
||
|
|
--include=GstVideo-@GST_API_VERSION@ \
|
||
|
|
- --libtool="$(top_builddir)/libtool" \
|
||
|
|
+ --libtool="$(LIBTOOL)" \
|
||
|
|
--pkg gstreamer-@GST_API_VERSION@ \
|
||
|
|
--pkg gstreamer-base-@GST_API_VERSION@ \
|
||
|
|
--pkg gstreamer-video-@GST_API_VERSION@ \
|
||
|
|
diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefile.am
|
||
|
|
index 1f8ea30..4b98ef6 100644
|
||
|
|
--- a/gst-libs/gst/insertbin/Makefile.am
|
||
|
|
+++ b/gst-libs/gst/insertbin/Makefile.am
|
||
|
|
@@ -45,7 +45,7 @@ GstInsertBin-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstinsertbin-@GS
|
||
|
|
--library=libgstinsertbin-@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-insertbin-@GST_API_VERSION@ \
|
||
|
|
diff --git a/gst-libs/gst/mpegts/Makefile.am b/gst-libs/gst/mpegts/Makefile.am
|
||
|
|
index aeea32e..929d9cc 100644
|
||
|
|
--- a/gst-libs/gst/mpegts/Makefile.am
|
||
|
|
+++ b/gst-libs/gst/mpegts/Makefile.am
|
||
|
|
@@ -79,7 +79,7 @@ GstMpegts-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstmpegts-@GST_API_
|
||
|
|
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
|
||
|
|
--library=libgstmpegts-@GST_API_VERSION@.la \
|
||
|
|
--include=Gst-@GST_API_VERSION@ \
|
||
|
|
- --libtool="$(top_builddir)/libtool" \
|
||
|
|
+ --libtool="$(LIBTOOL)" \
|
||
|
|
--pkg gstreamer-@GST_API_VERSION@ \
|
||
|
|
--pkg gstreamer-video-@GST_API_VERSION@ \
|
||
|
|
--pkg-export gstreamer-mpegts-@GST_API_VERSION@ \
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|
||
|
|
--- a/gst-libs/gst/allocators/Makefile.am 2017-06-06 13:34:13.206127663 +0200
|
||
|
|
+++ b/gst-libs/gst/allocators/Makefile.am 2017-06-06 13:34:44.395382923 +0200
|
||
|
|
@@ -37,7 +37,7 @@
|
||
|
|
--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
|
||
|
|
--library=libgstbadallocators-@GST_API_VERSION@.la \
|
||
|
|
--include=Gst-@GST_API_VERSION@ \
|
||
|
|
- --libtool="$(top_builddir)/libtool" \
|
||
|
|
+ --libtool="$(LIBTOOL)" \
|
||
|
|
--pkg gstreamer-@GST_API_VERSION@ \
|
||
|
|
--pkg-export gstreamer-badallocators-@GST_API_VERSION@ \
|
||
|
|
--output $@ \
|