code.ossystems Code Review - meta-freescale.git/blob

   1 From c890afb8a542a272acb398e8fc289b790afa08e4 Mon Sep 17 00:00:00 2001
   2 From: Yuqing Zhu <carol.zhu@nxp.com>
   3 Date: Sat, 21 Apr 2018 00:51:12 +0800
   4 Subject: [PATCH] Makefile.am: don't hardcode libtool name when running
   5  introspection tools
   6
   7 Do refine base on commit: 7592e793b3906355d76ca9a59f8fea2749ea2a4e
   8
   9 Upstream-Status: Pending [review on oe-core list]
  10
  11 Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com>
  12 ---
  13  gst-libs/gst/insertbin/Makefile.am | 2 +-
  14  gst-libs/gst/mpegts/Makefile.am    | 2 +-
  15  2 files changed, 2 insertions(+), 2 deletions(-)
  16
  17 diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefile.am
  18 index 1f8ea30..4b98ef6 100644
  19 --- a/gst-libs/gst/insertbin/Makefile.am
  20 +++ b/gst-libs/gst/insertbin/Makefile.am
  21 @@ -45,7 +45,7 @@ GstInsertBin-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstinsertbin-@GS
  22                 --library=libgstinsertbin-@GST_API_VERSION@.la \
  23                 --include=Gst-@GST_API_VERSION@ \
  24                 --include=GstBase-@GST_API_VERSION@ \
  25 -               --libtool="$(top_builddir)/libtool" \
  26 +               --libtool="$(LIBTOOL)" \
  27                 --pkg gstreamer-@GST_API_VERSION@ \
  28                 --pkg gstreamer-base-@GST_API_VERSION@ \
  29                 --pkg-export gstreamer-insertbin-@GST_API_VERSION@ \
  30 diff --git a/gst-libs/gst/mpegts/Makefile.am b/gst-libs/gst/mpegts/Makefile.am
  31 index f264e33..9934a4d 100644
  32 --- a/gst-libs/gst/mpegts/Makefile.am
  33 +++ b/gst-libs/gst/mpegts/Makefile.am
  34 @@ -82,7 +82,7 @@ GstMpegts-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstmpegts-@GST_API_
  35                 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
  36                 --library=libgstmpegts-@GST_API_VERSION@.la \
  37                 --include=Gst-@GST_API_VERSION@ \
  38 -               --libtool="$(top_builddir)/libtool" \
  39 +               --libtool="$(LIBTOOL)" \
  40                 --pkg gstreamer-@GST_API_VERSION@ \
  41                 --pkg gstreamer-video-@GST_API_VERSION@ \
  42                 --pkg-export gstreamer-mpegts-@GST_API_VERSION@ \
  43 --
  44 2.7.4
  45