| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame^] | 1 | From cff6fbf555a072408c21da1e818209c9d3814dd3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Tue, 27 Oct 2015 14:36:58 +0200 |
| 4 | Subject: [PATCH] Makefile.am: don't hardcode libtool name when running |
| 5 | introspection tools |
| 6 | |
| 7 | Upstream-Status: Pending [review on oe-core list] |
| 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 9 | |
| 10 | --- |
| 11 | gst-libs/gst/gl/Makefile.am | 2 +- |
| 12 | gst-libs/gst/insertbin/Makefile.am | 2 +- |
| 13 | gst-libs/gst/mpegts/Makefile.am | 2 +- |
| 14 | 3 files changed, 3 insertions(+), 3 deletions(-) |
| 15 | |
| 16 | diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am |
| 17 | index f968357..7cc2c7a 100644 |
| 18 | --- a/gst-libs/gst/gl/Makefile.am |
| 19 | +++ b/gst-libs/gst/gl/Makefile.am |
| 20 | @@ -149,7 +149,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ |
| 21 | --library=libgstgl-@GST_API_VERSION@.la \ |
| 22 | --include=Gst-@GST_API_VERSION@ \ |
| 23 | --include=GstBase-@GST_API_VERSION@ \ |
| 24 | - --libtool="$(top_builddir)/libtool" \ |
| 25 | + --libtool="$(LIBTOOL)" \ |
| 26 | --pkg gstreamer-@GST_API_VERSION@ \ |
| 27 | --pkg gstreamer-base-@GST_API_VERSION@ \ |
| 28 | --pkg gstreamer-video-@GST_API_VERSION@ \ |
| 29 | diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefile.am |
| 30 | index 09eb97c..b746885 100644 |
| 31 | --- a/gst-libs/gst/insertbin/Makefile.am |
| 32 | +++ b/gst-libs/gst/insertbin/Makefile.am |
| 33 | @@ -43,7 +43,7 @@ GstInsertBin-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstinsertbin-@GS |
| 34 | --library=libgstinsertbin-@GST_API_VERSION@.la \ |
| 35 | --include=Gst-@GST_API_VERSION@ \ |
| 36 | --include=GstBase-@GST_API_VERSION@ \ |
| 37 | - --libtool="$(top_builddir)/libtool" \ |
| 38 | + --libtool="$(LIBTOOL)" \ |
| 39 | --pkg gstreamer-@GST_API_VERSION@ \ |
| 40 | --pkg gstreamer-base-@GST_API_VERSION@ \ |
| 41 | --pkg-export gstreamer-insertbin-@GST_API_VERSION@ \ |
| 42 | diff --git a/gst-libs/gst/mpegts/Makefile.am b/gst-libs/gst/mpegts/Makefile.am |
| 43 | index 2511d49..c1cbce6 100644 |
| 44 | --- a/gst-libs/gst/mpegts/Makefile.am |
| 45 | +++ b/gst-libs/gst/mpegts/Makefile.am |
| 46 | @@ -78,7 +78,7 @@ GstMpegts-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstmpegts-@GST_API_ |
| 47 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ |
| 48 | --library=libgstmpegts-@GST_API_VERSION@.la \ |
| 49 | --include=Gst-@GST_API_VERSION@ \ |
| 50 | - --libtool="$(top_builddir)/libtool" \ |
| 51 | + --libtool="$(LIBTOOL)" \ |
| 52 | --pkg gstreamer-@GST_API_VERSION@ \ |
| 53 | --pkg gstreamer-video-@GST_API_VERSION@ \ |
| 54 | --pkg-export gstreamer-mpegts-@GST_API_VERSION@ \ |
| 55 | -- |
| 56 | 2.6.2 |
| 57 | |