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

   1 From 9601fc0cd6751a1affdc8717217b95931db31d7f Mon Sep 17 00:00:00 2001
   2 From: Alexander Kanavin <alex.kanavin@gmail.com>
   3 Date: Thu, 5 Apr 2018 10:26:25 +0800
   4 Subject: [PATCH] Makefile.am: prefix calls to pkg-config with
   5  PKG_CONFIG_SYSROOT_DIR
   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 |  4 ++--
  13  gst-libs/gst/app/Makefile.am        |  4 ++--
  14  gst-libs/gst/audio/Makefile.am      | 12 ++++++------
  15  gst-libs/gst/gl/Makefile.am         |  8 ++++----
  16  gst-libs/gst/pbutils/Makefile.am    | 12 ++++++------
  17  gst-libs/gst/riff/Makefile.am       |  8 ++++----
  18  gst-libs/gst/rtp/Makefile.am        |  8 ++++----
  19  gst-libs/gst/rtsp/Makefile.am       |  4 ++--
  20  gst-libs/gst/sdp/Makefile.am        |  4 ++--
  21  gst-libs/gst/tag/Makefile.am        |  8 ++++----
  22  gst-libs/gst/video/Makefile.am      |  8 ++++----
  23  11 files changed, 40 insertions(+), 40 deletions(-)
  24
  25 diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
  26 index 1ecc950..d6417ac 100644
  27 --- a/gst-libs/gst/allocators/Makefile.am
  28 +++ b/gst-libs/gst/allocators/Makefile.am
  29 @@ -39,7 +39,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
  30                 --c-include "gst/allocators/allocators.h" \
  31                 -I$(top_srcdir)/gst-libs \
  32                 -I$(top_builddir)/gst-libs \
  33 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  34 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  35                 --library=libgstallocators-@GST_API_VERSION@.la \
  36                 --include=Gst-@GST_API_VERSION@ \
  37                 --libtool="${LIBTOOL}" \
  38 @@ -63,7 +63,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
  39                 $(INTROSPECTION_COMPILER) \
  40                 --includedir=$(srcdir) \
  41                 --includedir=$(builddir) \
  42 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  43 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  44                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  45
  46  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
  47 diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
  48 index 5bfd606..6441674 100644
  49 --- a/gst-libs/gst/app/Makefile.am
  50 +++ b/gst-libs/gst/app/Makefile.am
  51 @@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
  52                 --c-include "gst/app/app.h" \
  53                 -I$(top_srcdir)/gst-libs \
  54                 -I$(top_builddir)/gst-libs \
  55 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  56 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
  57 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  58 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
  59                 --library=libgstapp-@GST_API_VERSION@.la \
  60                 --include=Gst-@GST_API_VERSION@ \
  61                 --include=GstBase-@GST_API_VERSION@ \
  62 diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
  63 index 7fb65f2..5379f79 100644
  64 --- a/gst-libs/gst/audio/Makefile.am
  65 +++ b/gst-libs/gst/audio/Makefile.am
  66 @@ -176,12 +176,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
  67                 -I$(top_srcdir)/gst-libs \
  68                 -I$(top_builddir)/gst-libs \
  69                 --c-include "gst/audio/audio.h" \
  70 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  71 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
  72 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  73 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
  74                 --add-include-path="$(top_builddir)/gst-libs/gst/tag/" \
  75                 --library=libgstaudio-@GST_API_VERSION@.la \
  76 -               --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
  77 -               --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
  78 +               --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
  79 +               --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
  80                 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
  81                 --include=Gst-@GST_API_VERSION@ \
  82                 --include=GstBase-@GST_API_VERSION@ \
  83 @@ -210,8 +210,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
  84                 --includedir=$(srcdir) \
  85                 --includedir=$(builddir) \
  86                 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
  87 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
  88 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  89 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
  90 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  91                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  92
  93  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
  94 diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
  95 index 3276d7f..0cdfe26 100644
  96 --- a/gst-libs/gst/gl/Makefile.am
  97 +++ b/gst-libs/gst/gl/Makefile.am
  98 @@ -209,9 +209,9 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
  99                 $(GST_PLUGINS_BASE_CFLAGS) \
 100                 $(GL_CFLAGS) \
 101                 --add-include-path="$(top_builddir)/gst-libs/gst/video/" \
 102 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 103 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 104                 --library-path="$(top_builddir)/gst-libs/gst/video/" \
 105 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 106 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 107                 --library=libgstgl-@GST_API_VERSION@.la \
 108                 --include=Gst-@GST_API_VERSION@ \
 109                 --include=GstBase-@GST_API_VERSION@ \
 110 @@ -241,8 +241,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 111                 --includedir=$(srcdir) \
 112                 --includedir=$(builddir) \
 113                 --includedir="$(top_builddir)/gst-libs/gst/video/" \
 114 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 115 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 116 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 117 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 118                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 119
 120  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 121 diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
 122 index 35a6e44..49d6894 100644
 123 --- a/gst-libs/gst/pbutils/Makefile.am
 124 +++ b/gst-libs/gst/pbutils/Makefile.am
 125 @@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
 126                 --c-include "gst/pbutils/pbutils.h" \
 127                 -I$(top_srcdir)/gst-libs \
 128                 -I$(top_builddir)/gst-libs \
 129 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 130 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 131 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 132 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 133                 --add-include-path="$(top_builddir)/gst-libs/gst/tag/" \
 134                 --add-include-path="$(top_builddir)/gst-libs/gst/video/" \
 135                 --add-include-path="$(top_builddir)/gst-libs/gst/audio/" \
 136                 --library=libgstpbutils-@GST_API_VERSION@.la \
 137 -               --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
 138 -               --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
 139 +               --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
 140 +               --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
 141                 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
 142                 --library-path="$(top_builddir)/gst-libs/gst/video/" \
 143                 --library-path="$(top_builddir)/gst-libs/gst/audio/" \
 144 @@ -128,8 +128,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 145                 $(INTROSPECTION_COMPILER) \
 146                 --includedir=$(srcdir) \
 147                 --includedir=$(builddir) \
 148 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 149 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 150 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 151 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 152                 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
 153                 --includedir="$(top_builddir)/gst-libs/gst/video/" \
 154                 --includedir="$(top_builddir)/gst-libs/gst/audio/" \
 155 diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
 156 index e66ef4f..c8c588a 100644
 157 --- a/gst-libs/gst/riff/Makefile.am
 158 +++ b/gst-libs/gst/riff/Makefile.am
 159 @@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
 160  #              --c-include "gst/riff/riff.h" \
 161  #              --add-include-path=$(builddir)/../tag \
 162  #              --add-include-path=$(builddir)/../audio \
 163 -#              --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 164 -#              --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 165 +#              --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 166 +#              --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 167  #              --library=libgstriff-@GST_API_VERSION@.la \
 168  #              --include=GstAudio-@GST_API_VERSION@ \
 169  #              --include=GstTag-@GST_API_VERSION@ \
 170 @@ -75,8 +75,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
 171  #              --includedir=$(builddir) \
 172  #              --includedir=$(builddir)/../tag \
 173  #              --includedir=$(builddir)/../audio \
 174 -#              --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 175 -#              --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 176 +#              --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 177 +#              --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 178  #              $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 179  #
 180  #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 181 diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
 182 index 77ebeeb..9aee788 100644
 183 --- a/gst-libs/gst/rtp/Makefile.am
 184 +++ b/gst-libs/gst/rtp/Makefile.am
 185 @@ -66,8 +66,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
 186                 --c-include "gst/rtp/rtp.h" \
 187                 -I$(top_builddir)/gst-libs \
 188                 -I$(top_srcdir)/gst-libs \
 189 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 190 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 191 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 192 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 193                 --library=libgstrtp-@GST_API_VERSION@.la \
 194                 --include=Gst-@GST_API_VERSION@ \
 195                 --include=GstBase-@GST_API_VERSION@ \
 196 @@ -94,8 +94,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 197                 $(INTROSPECTION_COMPILER) \
 198                 --includedir=$(srcdir) \
 199                 --includedir=$(builddir) \
 200 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 201 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 202 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 203 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 204                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 205
 206  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 207 diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
 208 index db9d0fd..79027cb 100644
 209 --- a/gst-libs/gst/rtsp/Makefile.am
 210 +++ b/gst-libs/gst/rtsp/Makefile.am
 211 @@ -71,8 +71,8 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
 212                 -I$(top_builddir)/gst-libs \
 213                 -I$(top_srcdir)/gst-libs \
 214                 --add-include-path=$(builddir)/../sdp \
 215 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 216 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 217 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 218 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 219                 --library=libgstrtsp-@GST_API_VERSION@.la \
 220                 --include=Gio-2.0 \
 221                 --include=Gst-@GST_API_VERSION@ \
 222 diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
 223 index 6e05cc7..c7cf514 100644
 224 --- a/gst-libs/gst/sdp/Makefile.am
 225 +++ b/gst-libs/gst/sdp/Makefile.am
 226 @@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
 227                 --warn-all \
 228                 --c-include "gst/sdp/sdp.h" \
 229                 -I$(top_srcdir)/gst-libs \
 230 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 231 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 232                 --library=libgstsdp-@GST_API_VERSION@.la \
 233                 --include=Gst-@GST_API_VERSION@ \
 234                 --libtool="${LIBTOOL}" \
 235 @@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 236                 $(INTROSPECTION_COMPILER) \
 237                 --includedir=$(srcdir) \
 238                 --includedir=$(builddir) \
 239 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 240 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 241                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 242
 243  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 244 diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
 245 index c86515b..363e6d2 100644
 246 --- a/gst-libs/gst/tag/Makefile.am
 247 +++ b/gst-libs/gst/tag/Makefile.am
 248 @@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
 249                 --c-include "gst/tag/tag.h" \
 250                 -I$(top_srcdir)/gst-libs \
 251                 -I$(top_builddir)/gst-libs \
 252 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 253 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 254 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 255 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 256                 --library=libgsttag-@GST_API_VERSION@.la \
 257                 --include=Gst-@GST_API_VERSION@ \
 258                 --include=GstBase-@GST_API_VERSION@ \
 259 @@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 260                 $(INTROSPECTION_COMPILER) \
 261                 --includedir=$(srcdir) \
 262                 --includedir=$(builddir) \
 263 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 264 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 265 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 266 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 267                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 268
 269  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 270 diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
 271 index 0f8455f..8c9955c 100644
 272 --- a/gst-libs/gst/video/Makefile.am
 273 +++ b/gst-libs/gst/video/Makefile.am
 274 @@ -124,8 +124,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
 275                 --c-include "gst/video/video.h" \
 276                 -I$(top_srcdir)/gst-libs \
 277                 -I$(top_builddir)/gst-libs \
 278 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 279 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 280 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 281 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 282                 --library=libgstvideo-@GST_API_VERSION@.la \
 283                 --include=Gst-@GST_API_VERSION@ \
 284                 --include=GstBase-@GST_API_VERSION@ \
 285 @@ -152,8 +152,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 286                 $(INTROSPECTION_COMPILER) \
 287                 --includedir=$(srcdir) \
 288                 --includedir=$(builddir) \
 289 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 290 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 291 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 292 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 293                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 294
 295  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)