| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 7592e793b3906355d76ca9a59f8fea2749ea2a4e Mon Sep 17 00:00:00 2001 |
| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 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 | |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 10 | %% original patch: 0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch |
| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 11 | |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 12 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
| 13 | --- |
| 14 | gst-libs/gst/allocators/Makefile.am | 2 +- |
| 15 | gst-libs/gst/gl/Makefile.am | 2 +- |
| 16 | gst-libs/gst/insertbin/Makefile.am | 2 +- |
| 17 | gst-libs/gst/mpegts/Makefile.am | 2 +- |
| 18 | 4 files changed, 4 insertions(+), 4 deletions(-) |
| 19 | |
| 20 | diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am |
| 21 | index e50d077..623f092 100644 |
| 22 | --- a/gst-libs/gst/allocators/Makefile.am |
| 23 | +++ b/gst-libs/gst/allocators/Makefile.am |
| 24 | @@ -37,7 +37,7 @@ GstBadAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstbadalloca |
| 25 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
| 26 | --library=libgstbadallocators-@GST_API_VERSION@.la \ |
| 27 | --include=Gst-@GST_API_VERSION@ \ |
| 28 | - --libtool="$(top_builddir)/libtool" \ |
| 29 | + --libtool="$(LIBTOOL)" \ |
| 30 | --pkg gstreamer-@GST_API_VERSION@ \ |
| 31 | --pkg-export gstreamer-badallocators-@GST_API_VERSION@ \ |
| 32 | --output $@ \ |
| 33 | diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am |
| 34 | index 2ae4773..dfa7a7d 100644 |
| 35 | --- a/gst-libs/gst/gl/Makefile.am |
| 36 | +++ b/gst-libs/gst/gl/Makefile.am |
| 37 | @@ -178,7 +178,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ |
| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 38 | --include=Gst-@GST_API_VERSION@ \ |
| 39 | --include=GstBase-@GST_API_VERSION@ \ |
| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 40 | --include=GstVideo-@GST_API_VERSION@ \ |
| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 41 | - --libtool="$(top_builddir)/libtool" \ |
| 42 | + --libtool="$(LIBTOOL)" \ |
| 43 | --pkg gstreamer-@GST_API_VERSION@ \ |
| 44 | --pkg gstreamer-base-@GST_API_VERSION@ \ |
| 45 | --pkg gstreamer-video-@GST_API_VERSION@ \ |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 46 | diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefile.am |
| 47 | index 1f8ea30..4b98ef6 100644 |
| 48 | --- a/gst-libs/gst/insertbin/Makefile.am |
| 49 | +++ b/gst-libs/gst/insertbin/Makefile.am |
| 50 | @@ -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] | 51 | --library=libgstinsertbin-@GST_API_VERSION@.la \ |
| 52 | --include=Gst-@GST_API_VERSION@ \ |
| 53 | --include=GstBase-@GST_API_VERSION@ \ |
| 54 | - --libtool="$(top_builddir)/libtool" \ |
| 55 | + --libtool="$(LIBTOOL)" \ |
| 56 | --pkg gstreamer-@GST_API_VERSION@ \ |
| 57 | --pkg gstreamer-base-@GST_API_VERSION@ \ |
| 58 | --pkg-export gstreamer-insertbin-@GST_API_VERSION@ \ |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 59 | diff --git a/gst-libs/gst/mpegts/Makefile.am b/gst-libs/gst/mpegts/Makefile.am |
| 60 | index aeea32e..929d9cc 100644 |
| 61 | --- a/gst-libs/gst/mpegts/Makefile.am |
| 62 | +++ b/gst-libs/gst/mpegts/Makefile.am |
| 63 | @@ -79,7 +79,7 @@ GstMpegts-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstmpegts-@GST_API_ |
| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 64 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ |
| 65 | --library=libgstmpegts-@GST_API_VERSION@.la \ |
| 66 | --include=Gst-@GST_API_VERSION@ \ |
| 67 | - --libtool="$(top_builddir)/libtool" \ |
| 68 | + --libtool="$(LIBTOOL)" \ |
| 69 | --pkg gstreamer-@GST_API_VERSION@ \ |
| 70 | --pkg gstreamer-video-@GST_API_VERSION@ \ |
| 71 | --pkg-export gstreamer-mpegts-@GST_API_VERSION@ \ |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 72 | -- |
| 73 | 2.4.0 |
| 74 | |