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

   1 From 77b88eae845060d38cf788651f66a7ae98f9b199 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         | 12 ++++++------
  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, 42 insertions(+), 42 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 @@ -174,12 +174,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 @@ -208,8 +208,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 16f829f..fc15a6d 100644
  96 --- a/gst-libs/gst/gl/Makefile.am
  97 +++ b/gst-libs/gst/gl/Makefile.am
  98 @@ -185,9 +185,9 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
  99                 -I$(top_builddir)/gst-libs \
 100                 $(GST_PLUGINS_BASE_CFLAGS) \
 101                 $(GL_CFLAGS) \
 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 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
 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 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
 108                 --library=libgstgl-@GST_API_VERSION@.la \
 109                 --include=Gst-@GST_API_VERSION@ \
 110                 --include=GstBase-@GST_API_VERSION@ \
 111 @@ -216,9 +216,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 112                 $(INTROSPECTION_COMPILER) \
 113                 --includedir=$(srcdir) \
 114                 --includedir=$(builddir) \
 115 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 116 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 117 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
 118 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 119 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 120 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
 121                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 122
 123  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 124 diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
 125 index 35a6e44..49d6894 100644
 126 --- a/gst-libs/gst/pbutils/Makefile.am
 127 +++ b/gst-libs/gst/pbutils/Makefile.am
 128 @@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
 129                 --c-include "gst/pbutils/pbutils.h" \
 130                 -I$(top_srcdir)/gst-libs \
 131                 -I$(top_builddir)/gst-libs \
 132 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 133 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 134 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 135 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 136                 --add-include-path="$(top_builddir)/gst-libs/gst/tag/" \
 137                 --add-include-path="$(top_builddir)/gst-libs/gst/video/" \
 138                 --add-include-path="$(top_builddir)/gst-libs/gst/audio/" \
 139                 --library=libgstpbutils-@GST_API_VERSION@.la \
 140 -               --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
 141 -               --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
 142 +               --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
 143 +               --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
 144                 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
 145                 --library-path="$(top_builddir)/gst-libs/gst/video/" \
 146                 --library-path="$(top_builddir)/gst-libs/gst/audio/" \
 147 @@ -128,8 +128,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 148                 $(INTROSPECTION_COMPILER) \
 149                 --includedir=$(srcdir) \
 150                 --includedir=$(builddir) \
 151 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 152 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 153 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 154 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 155                 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
 156                 --includedir="$(top_builddir)/gst-libs/gst/video/" \
 157                 --includedir="$(top_builddir)/gst-libs/gst/audio/" \
 158 diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
 159 index e66ef4f..c8c588a 100644
 160 --- a/gst-libs/gst/riff/Makefile.am
 161 +++ b/gst-libs/gst/riff/Makefile.am
 162 @@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
 163  #              --c-include "gst/riff/riff.h" \
 164  #              --add-include-path=$(builddir)/../tag \
 165  #              --add-include-path=$(builddir)/../audio \
 166 -#              --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 167 -#              --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 168 +#              --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 169 +#              --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 170  #              --library=libgstriff-@GST_API_VERSION@.la \
 171  #              --include=GstAudio-@GST_API_VERSION@ \
 172  #              --include=GstTag-@GST_API_VERSION@ \
 173 @@ -75,8 +75,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
 174  #              --includedir=$(builddir) \
 175  #              --includedir=$(builddir)/../tag \
 176  #              --includedir=$(builddir)/../audio \
 177 -#              --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 178 -#              --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 179 +#              --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 180 +#              --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 181  #              $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 182  #
 183  #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 184 diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
 185 index 77ebeeb..9aee788 100644
 186 --- a/gst-libs/gst/rtp/Makefile.am
 187 +++ b/gst-libs/gst/rtp/Makefile.am
 188 @@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
 189                 --c-include "gst/rtp/rtp.h" \
 190                 -I$(top_builddir)/gst-libs \
 191                 -I$(top_srcdir)/gst-libs \
 192 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 193 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 194 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 195 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 196                 --library=libgstrtp-@GST_API_VERSION@.la \
 197                 --include=Gst-@GST_API_VERSION@ \
 198                 --include=GstBase-@GST_API_VERSION@ \
 199 @@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 200                 $(INTROSPECTION_COMPILER) \
 201                 --includedir=$(srcdir) \
 202                 --includedir=$(builddir) \
 203 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 204 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 205 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 206 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 207                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 208
 209  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 210 diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
 211 index db9d0fd..79027cb 100644
 212 --- a/gst-libs/gst/rtsp/Makefile.am
 213 +++ b/gst-libs/gst/rtsp/Makefile.am
 214 @@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
 215                 -I$(top_builddir)/gst-libs \
 216                 -I$(top_srcdir)/gst-libs \
 217                 --add-include-path=$(builddir)/../sdp \
 218 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 219 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 220                 --library=libgstrtsp-@GST_API_VERSION@.la \
 221                 --include=Gio-2.0 \
 222                 --include=Gst-@GST_API_VERSION@ \
 223 @@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 224                 --includedir=$(srcdir) \
 225                 --includedir=$(builddir) \
 226                 --includedir=$(builddir)/../sdp \
 227 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 228 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 229                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 230
 231  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 232 diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
 233 index 6e05cc7..c7cf514 100644
 234 --- a/gst-libs/gst/sdp/Makefile.am
 235 +++ b/gst-libs/gst/sdp/Makefile.am
 236 @@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
 237                 --warn-all \
 238                 --c-include "gst/sdp/sdp.h" \
 239                 -I$(top_srcdir)/gst-libs \
 240 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 241 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 242                 --library=libgstsdp-@GST_API_VERSION@.la \
 243                 --include=Gst-@GST_API_VERSION@ \
 244                 --libtool="$(LIBTOOL)" \
 245 @@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 246                 $(INTROSPECTION_COMPILER) \
 247                 --includedir=$(srcdir) \
 248                 --includedir=$(builddir) \
 249 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 250 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 251                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 252
 253  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 254 diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
 255 index c86515b..363e6d2 100644
 256 --- a/gst-libs/gst/tag/Makefile.am
 257 +++ b/gst-libs/gst/tag/Makefile.am
 258 @@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
 259                 --c-include "gst/tag/tag.h" \
 260                 -I$(top_srcdir)/gst-libs \
 261                 -I$(top_builddir)/gst-libs \
 262 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 263 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 264 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 265 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 266                 --library=libgsttag-@GST_API_VERSION@.la \
 267                 --include=Gst-@GST_API_VERSION@ \
 268                 --include=GstBase-@GST_API_VERSION@ \
 269 @@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 270                 $(INTROSPECTION_COMPILER) \
 271                 --includedir=$(srcdir) \
 272                 --includedir=$(builddir) \
 273 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 274 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 275 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 276 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 277                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 278
 279  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 280 diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
 281 index 0f8455f..8c9955c 100644
 282 --- a/gst-libs/gst/video/Makefile.am
 283 +++ b/gst-libs/gst/video/Makefile.am
 284 @@ -119,8 +119,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
 285                 --c-include "gst/video/video.h" \
 286                 -I$(top_srcdir)/gst-libs \
 287                 -I$(top_builddir)/gst-libs \
 288 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 289 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 290 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 291 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 292                 --library=libgstvideo-@GST_API_VERSION@.la \
 293                 --include=Gst-@GST_API_VERSION@ \
 294                 --include=GstBase-@GST_API_VERSION@ \
 295 @@ -147,8 +147,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 296                 $(INTROSPECTION_COMPILER) \
 297                 --includedir=$(srcdir) \
 298                 --includedir=$(builddir) \
 299 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 300 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 301 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 302 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 303                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 304
 305  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)