code.ossystems Code Review - openembedded-core.git/blob

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