Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 7d8e8b8bcce34d01fc7ad7285b4eb17ad8949399 Mon Sep 17 00:00:00 2001 |
| 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
| 3 | Date: Wed, 11 Apr 2018 11:06:39 +0800 |
| 4 | Subject: [PATCH] Makefile.am: don't hardcode libtool name when running |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 5 | introspection tools |
| 6 | |
| 7 | Upstream-Status: Pending [review on oe-core list] |
| 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 9 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
| 10 | --- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 11 | gst-libs/gst/insertbin/Makefile.am | 2 +- |
| 12 | gst-libs/gst/mpegts/Makefile.am | 2 +- |
| 13 | 2 files changed, 2 insertions(+), 2 deletions(-) |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 14 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 15 | diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefile.am |
| 16 | index 1f8ea30..4b98ef6 100644 |
| 17 | --- a/gst-libs/gst/insertbin/Makefile.am |
| 18 | +++ b/gst-libs/gst/insertbin/Makefile.am |
| 19 | @@ -45,7 +45,7 @@ GstInsertBin-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstinsertbin-@GS |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 20 | --library=libgstinsertbin-@GST_API_VERSION@.la \ |
| 21 | --include=Gst-@GST_API_VERSION@ \ |
| 22 | --include=GstBase-@GST_API_VERSION@ \ |
| 23 | - --libtool="$(top_builddir)/libtool" \ |
| 24 | + --libtool="$(LIBTOOL)" \ |
| 25 | --pkg gstreamer-@GST_API_VERSION@ \ |
| 26 | --pkg gstreamer-base-@GST_API_VERSION@ \ |
| 27 | --pkg-export gstreamer-insertbin-@GST_API_VERSION@ \ |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 28 | diff --git a/gst-libs/gst/mpegts/Makefile.am b/gst-libs/gst/mpegts/Makefile.am |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 29 | index f264e33..9934a4d 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 30 | --- a/gst-libs/gst/mpegts/Makefile.am |
| 31 | +++ b/gst-libs/gst/mpegts/Makefile.am |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 32 | @@ -82,7 +82,7 @@ GstMpegts-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstmpegts-@GST_API_ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 33 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ |
| 34 | --library=libgstmpegts-@GST_API_VERSION@.la \ |
| 35 | --include=Gst-@GST_API_VERSION@ \ |
| 36 | - --libtool="$(top_builddir)/libtool" \ |
| 37 | + --libtool="$(LIBTOOL)" \ |
| 38 | --pkg gstreamer-@GST_API_VERSION@ \ |
| 39 | --pkg gstreamer-video-@GST_API_VERSION@ \ |
| 40 | --pkg-export gstreamer-mpegts-@GST_API_VERSION@ \ |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 41 | -- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 42 | 2.7.4 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 43 | |