]> code.ossystems Code Review - openembedded-core.git/blob
43f1ee0d23276d522c96311afd22ca2f10395670
[openembedded-core.git] /
1 From cff6fbf555a072408c21da1e818209c9d3814dd3 Mon Sep 17 00:00:00 2001
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
10 ---
11  gst-libs/gst/gl/Makefile.am        | 2 +-
12  gst-libs/gst/insertbin/Makefile.am | 2 +-
13  gst-libs/gst/mpegts/Makefile.am    | 2 +-
14  3 files changed, 3 insertions(+), 3 deletions(-)
15
16 Index: gst-plugins-bad-1.10.1/gst-libs/gst/gl/Makefile.am
17 ===================================================================
18 --- gst-plugins-bad-1.10.1.orig/gst-libs/gst/gl/Makefile.am
19 +++ gst-plugins-bad-1.10.1/gst-libs/gst/gl/Makefile.am
20 @@ -171,7 +171,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPEC
21                 --include=Gst-@GST_API_VERSION@ \
22                 --include=GstBase-@GST_API_VERSION@ \
23                 --include=GstVideo-@GST_API_VERSION@ \
24 -               --libtool="$(top_builddir)/libtool" \
25 +               --libtool="$(LIBTOOL)" \
26                 --pkg gstreamer-@GST_API_VERSION@ \
27                 --pkg gstreamer-base-@GST_API_VERSION@ \
28                 --pkg gstreamer-video-@GST_API_VERSION@ \
29 Index: gst-plugins-bad-1.10.1/gst-libs/gst/insertbin/Makefile.am
30 ===================================================================
31 --- gst-plugins-bad-1.10.1.orig/gst-libs/gst/insertbin/Makefile.am
32 +++ gst-plugins-bad-1.10.1/gst-libs/gst/insertbin/Makefile.am
33 @@ -45,7 +45,7 @@ GstInsertBin-@GST_API_VERSION@.gir: $(IN
34                 --library=libgstinsertbin-@GST_API_VERSION@.la \
35                 --include=Gst-@GST_API_VERSION@ \
36                 --include=GstBase-@GST_API_VERSION@ \
37 -               --libtool="$(top_builddir)/libtool" \
38 +               --libtool="$(LIBTOOL)" \
39                 --pkg gstreamer-@GST_API_VERSION@ \
40                 --pkg gstreamer-base-@GST_API_VERSION@ \
41                 --pkg-export gstreamer-insertbin-@GST_API_VERSION@ \
42 Index: gst-plugins-bad-1.10.1/gst-libs/gst/mpegts/Makefile.am
43 ===================================================================
44 --- gst-plugins-bad-1.10.1.orig/gst-libs/gst/mpegts/Makefile.am
45 +++ gst-plugins-bad-1.10.1/gst-libs/gst/mpegts/Makefile.am
46 @@ -79,7 +79,7 @@ GstMpegts-@GST_API_VERSION@.gir: $(INTRO
47                 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
48                 --library=libgstmpegts-@GST_API_VERSION@.la \
49                 --include=Gst-@GST_API_VERSION@ \
50 -               --libtool="$(top_builddir)/libtool" \
51 +               --libtool="$(LIBTOOL)" \
52                 --pkg gstreamer-@GST_API_VERSION@ \
53                 --pkg gstreamer-video-@GST_API_VERSION@ \
54                 --pkg-export gstreamer-mpegts-@GST_API_VERSION@ \