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

   1 From a049bb15839557594713cb32e7d6bfe0e2127392 Mon Sep 17 00:00:00 2001
   2 From: Yuqing Zhu <carol.zhu@nxp.com>
   3 Date: Fri, 20 Apr 2018 22:46:46 +0800
   4 Subject: [PATCH] Makefile.am: don't hardcode libtool name when running
   5  introspection tools
   6
   7 Do patch refine basing on commit: f1d9652351e7754c63003104eceb526af424c7e0
   8
   9 Upstream-Status: Pending [review on oe-core maillist]
  10
  11 Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com>
  12 ---
  13  gst-libs/gst/allocators/Makefile.am | 2 +-
  14  gst-libs/gst/app/Makefile.am        | 2 +-
  15  gst-libs/gst/audio/Makefile.am      | 2 +-
  16  gst-libs/gst/gl/Makefile.am         | 2 +-
  17  gst-libs/gst/pbutils/Makefile.am    | 2 +-
  18  gst-libs/gst/riff/Makefile.am       | 2 +-
  19  gst-libs/gst/rtp/Makefile.am        | 2 +-
  20  gst-libs/gst/rtsp/Makefile.am       | 2 +-
  21  gst-libs/gst/sdp/Makefile.am        | 2 +-
  22  gst-libs/gst/tag/Makefile.am        | 2 +-
  23  gst-libs/gst/video/Makefile.am      | 2 +-
  24  11 files changed, 11 insertions(+), 11 deletions(-)
  25
  26 diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
  27 index 0edc0ae..d0d425d 100644
  28 --- a/gst-libs/gst/allocators/Makefile.am
  29 +++ b/gst-libs/gst/allocators/Makefile.am
  30 @@ -58,7 +58,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
  31                 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  32                 --library=libgstallocators-@GST_API_VERSION@.la \
  33                 --include=Gst-@GST_API_VERSION@ \
  34 -               --libtool="$(top_builddir)/libtool" \
  35 +               --libtool="$(LIBTOOL)" \
  36                 --pkg gstreamer-@GST_API_VERSION@ \
  37                 --pkg-export gstreamer-allocators-@GST_API_VERSION@ \
  38                 --output $@ \
  39 diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
  40 index 52f6ad3..5bfd606 100644
  41 --- a/gst-libs/gst/app/Makefile.am
  42 +++ b/gst-libs/gst/app/Makefile.am
  43 @@ -56,7 +56,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
  44                 --library=libgstapp-@GST_API_VERSION@.la \
  45                 --include=Gst-@GST_API_VERSION@ \
  46                 --include=GstBase-@GST_API_VERSION@ \
  47 -               --libtool="$(top_builddir)/libtool" \
  48 +               --libtool="$(LIBTOOL)" \
  49                 --pkg gstreamer-@GST_API_VERSION@ \
  50                 --pkg gstreamer-base-@GST_API_VERSION@ \
  51                 --pkg-export gstreamer-app-@GST_API_VERSION@ \
  52 diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
  53 index 2922245..7fb65f2 100644
  54 --- a/gst-libs/gst/audio/Makefile.am
  55 +++ b/gst-libs/gst/audio/Makefile.am
  56 @@ -184,7 +184,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
  57                 --include=Gst-@GST_API_VERSION@ \
  58                 --include=GstBase-@GST_API_VERSION@ \
  59                 --include=GstTag-@GST_API_VERSION@ \
  60 -               --libtool="$(top_builddir)/libtool" \
  61 +               --libtool="$(LIBTOOL)" \
  62                 --pkg gstreamer-@GST_API_VERSION@ \
  63                 --pkg gstreamer-base-@GST_API_VERSION@ \
  64                 --pkg-export gstreamer-audio-@GST_API_VERSION@ \
  65 diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
  66 index b04187f..576bf1c 100644
  67 --- a/gst-libs/gst/gl/Makefile.am
  68 +++ b/gst-libs/gst/gl/Makefile.am
  69 @@ -205,7 +205,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
  70                 --include=Gst-@GST_API_VERSION@ \
  71                 --include=GstBase-@GST_API_VERSION@ \
  72                 --include=GstVideo-@GST_API_VERSION@ \
  73 -               --libtool="$(top_builddir)/libtool" \
  74 +               --libtool="$(LIBTOOL)" \
  75                 --pkg gstreamer-@GST_API_VERSION@ \
  76                 --pkg gstreamer-base-@GST_API_VERSION@ \
  77                 --pkg gstreamer-video-@GST_API_VERSION@ \
  78 diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
  79 index ae51993..35a6e44 100644
  80 --- a/gst-libs/gst/pbutils/Makefile.am
  81 +++ b/gst-libs/gst/pbutils/Makefile.am
  82 @@ -103,7 +103,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
  83                 --include=GstTag-@GST_API_VERSION@ \
  84                 --include=GstVideo-@GST_API_VERSION@ \
  85                 --include=GstAudio-@GST_API_VERSION@ \
  86 -               --libtool="$(top_builddir)/libtool" \
  87 +               --libtool="$(LIBTOOL)" \
  88                 --pkg gstreamer-@GST_API_VERSION@ \
  89                 --pkg gstreamer-tag-@GST_API_VERSION@ \
  90                 --pkg gstreamer-video-@GST_API_VERSION@ \
  91 diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
  92 index fb53f06..e66ef4f 100644
  93 --- a/gst-libs/gst/riff/Makefile.am
  94 +++ b/gst-libs/gst/riff/Makefile.am
  95 @@ -49,7 +49,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
  96  #              --include=GstAudio-@GST_API_VERSION@ \
  97  #              --include=GstTag-@GST_API_VERSION@ \
  98  #              --include=Gst-@GST_API_VERSION@ \
  99 -#              --libtool="$(top_builddir)/libtool" \
 100 +#              --libtool="$(LIBTOOL)" \
 101  #              --pkg gstreamer-@GST_API_VERSION@ \
 102  #              --pkg gstreamer-tag-@GST_API_VERSION@ \
 103  #              --pkg gstreamer-audio-@GST_API_VERSION@ \
 104 diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
 105 index a6f971d..77ebeeb 100644
 106 --- a/gst-libs/gst/rtp/Makefile.am
 107 +++ b/gst-libs/gst/rtp/Makefile.am
 108 @@ -69,7 +69,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
 109                 --library=libgstrtp-@GST_API_VERSION@.la \
 110                 --include=Gst-@GST_API_VERSION@ \
 111                 --include=GstBase-@GST_API_VERSION@ \
 112 -               --libtool="$(top_builddir)/libtool" \
 113 +               --libtool="$(LIBTOOL)" \
 114                 --pkg gstreamer-@GST_API_VERSION@ \
 115                 --pkg gstreamer-base-@GST_API_VERSION@ \
 116                 --pkg-export gstreamer-rtp-@GST_API_VERSION@ \
 117 diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
 118 index ceb07f4..db9d0fd 100644
 119 --- a/gst-libs/gst/rtsp/Makefile.am
 120 +++ b/gst-libs/gst/rtsp/Makefile.am
 121 @@ -76,7 +76,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
 122                 --include=Gio-2.0 \
 123                 --include=Gst-@GST_API_VERSION@ \
 124                 --include=GstSdp-@GST_API_VERSION@ \
 125 -               --libtool="$(top_builddir)/libtool" \
 126 +               --libtool="$(LIBTOOL)" \
 127                 --pkg gio-2.0 \
 128                 --pkg gstreamer-@GST_API_VERSION@ \
 129                 --pkg gstreamer-sdp-@GST_API_VERSION@ \
 130 diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
 131 index e197e9b..6e05cc7 100644
 132 --- a/gst-libs/gst/sdp/Makefile.am
 133 +++ b/gst-libs/gst/sdp/Makefile.am
 134 @@ -34,7 +34,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
 135                 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 136                 --library=libgstsdp-@GST_API_VERSION@.la \
 137                 --include=Gst-@GST_API_VERSION@ \
 138 -               --libtool="$(top_builddir)/libtool" \
 139 +               --libtool="$(LIBTOOL)" \
 140                 --pkg gstreamer-@GST_API_VERSION@ \
 141                 --pkg-export gstreamer-sdp-@GST_API_VERSION@ \
 142                 --output $@ \
 143 diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
 144 index 0247c33..c86515b 100644
 145 --- a/gst-libs/gst/tag/Makefile.am
 146 +++ b/gst-libs/gst/tag/Makefile.am
 147 @@ -66,7 +66,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
 148                 --library=libgsttag-@GST_API_VERSION@.la \
 149                 --include=Gst-@GST_API_VERSION@ \
 150                 --include=GstBase-@GST_API_VERSION@ \
 151 -               --libtool="$(top_builddir)/libtool" \
 152 +               --libtool="$(LIBTOOL)" \
 153                 --pkg gstreamer-@GST_API_VERSION@ \
 154                 --pkg gstreamer-base-@GST_API_VERSION@ \
 155                 --pkg-export gstreamer-tag-@GST_API_VERSION@ \
 156 diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
 157 index 1b74f37..0f7c07e 100644
 158 --- a/gst-libs/gst/video/Makefile.am
 159 +++ b/gst-libs/gst/video/Makefile.am
 160 @@ -126,7 +126,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
 161                 --library=libgstvideo-@GST_API_VERSION@.la \
 162                 --include=Gst-@GST_API_VERSION@ \
 163                 --include=GstBase-@GST_API_VERSION@ \
 164 -               --libtool="$(top_builddir)/libtool" \
 165 +               --libtool="$(LIBTOOL)" \
 166                 --pkg gstreamer-@GST_API_VERSION@ \
 167                 --pkg gstreamer-base-@GST_API_VERSION@ \
 168                 --pkg-export gstreamer-video-@GST_API_VERSION@ \
 169 --
 170 2.7.4
 171