58 lines
2.4 KiB
Diff
58 lines
2.4 KiB
Diff
From cff6fbf555a072408c21da1e818209c9d3814dd3 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
Date: Tue, 27 Oct 2015 14:36:58 +0200
|
|
Subject: [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>
|
|
|
|
---
|
|
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 f968357..7cc2c7a 100644
|
|
--- a/gst-libs/gst/gl/Makefile.am
|
|
+++ b/gst-libs/gst/gl/Makefile.am
|
|
@@ -149,7 +149,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
|
|
--library=libgstgl-@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 gstreamer-video-@GST_API_VERSION@ \
|
|
diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefile.am
|
|
index 09eb97c..b746885 100644
|
|
--- a/gst-libs/gst/insertbin/Makefile.am
|
|
+++ b/gst-libs/gst/insertbin/Makefile.am
|
|
@@ -43,7 +43,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 2511d49..c1cbce6 100644
|
|
--- a/gst-libs/gst/mpegts/Makefile.am
|
|
+++ b/gst-libs/gst/mpegts/Makefile.am
|
|
@@ -78,7 +78,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.6.2
|
|
|