Gitiles
Code Review Sign In
gerrit.openbmc.org / stefanberger / openbmc / e6aa2b72c3d8e177357451fb3c576a1dee956924 / . / poky / meta / recipes-multimedia / gstreamer / gstreamer1.0-plugins-base / 0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
blob: 2e1190ba01f9509a708c908a2dfdc7fdb449a237 [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]1From 9601fc0cd6751a1affdc8717217b95931db31d7f Mon Sep 17 00:00:00 2001
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]2From: Alexander Kanavin <alex.kanavin@gmail.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]3Date: Thu, 5 Apr 2018 10:26:25 +0800
4Subject: [PATCH] Makefile.am: prefix calls to pkg-config with
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]5 PKG_CONFIG_SYSROOT_DIR
6
7Upstream-Status: Pending [review on oe-core maillist]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]9Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
10
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]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 ++++++------
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]15 gst-libs/gst/gl/Makefile.am | 8 ++++----
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]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 ++++----
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]23 11 files changed, 40 insertions(+), 40 deletions(-)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]24
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]25diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
26index 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-@
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]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)" \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]38@@ -63,7 +63,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]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)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]47diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
48index 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
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]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@ \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]62diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
63index 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
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]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@ \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]83@@ -208,8 +208,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]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)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]94diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
95index 3276d7f..0cdfe26 100644
96--- a/gst-libs/gst/gl/Makefile.am
97+++ b/gst-libs/gst/gl/Makefile.am
98@@ -186,9 +186,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/" \
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]102- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]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/" \
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]105+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]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 \
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]108 --include=Gst-@GST_API_VERSION@ \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]109 --include=GstBase-@GST_API_VERSION@ \
110@@ -218,8 +218,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]111 --includedir=$(srcdir) \
112 --includedir=$(builddir) \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]113 --includedir="$(top_builddir)/gst-libs/gst/video/" \
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]114- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]115- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]116+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]117+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]118 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
119
120 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]121diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
122index 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
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]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/" \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]144@@ -128,8 +128,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]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/" \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]155diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
156index 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)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]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@ \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]170@@ -75,8 +75,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]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)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]181diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
182index 77ebeeb..9aee788 100644
183--- a/gst-libs/gst/rtp/Makefile.am
184+++ b/gst-libs/gst/rtp/Makefile.am
185@@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]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@ \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]196@@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]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)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]207diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
208index db9d0fd..79027cb 100644
209--- a/gst-libs/gst/rtsp/Makefile.am
210+++ b/gst-libs/gst/rtsp/Makefile.am
211@@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]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_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
217 --library=libgstrtsp-@GST_API_VERSION@.la \
218 --include=Gio-2.0 \
219 --include=Gst-@GST_API_VERSION@ \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]220@@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]221 --includedir=$(srcdir) \
222 --includedir=$(builddir) \
223 --includedir=$(builddir)/../sdp \
224- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
225+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
226 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
227
228 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]229diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
230index 6e05cc7..c7cf514 100644
231--- a/gst-libs/gst/sdp/Makefile.am
232+++ b/gst-libs/gst/sdp/Makefile.am
233@@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]234 --warn-all \
235 --c-include "gst/sdp/sdp.h" \
236 -I$(top_srcdir)/gst-libs \
237- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
238+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
239 --library=libgstsdp-@GST_API_VERSION@.la \
240 --include=Gst-@GST_API_VERSION@ \
241 --libtool="$(LIBTOOL)" \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]242@@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]243 $(INTROSPECTION_COMPILER) \
244 --includedir=$(srcdir) \
245 --includedir=$(builddir) \
246- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
247+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
248 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
249
250 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]251diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
252index c86515b..363e6d2 100644
253--- a/gst-libs/gst/tag/Makefile.am
254+++ b/gst-libs/gst/tag/Makefile.am
255@@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]256 --c-include "gst/tag/tag.h" \
257 -I$(top_srcdir)/gst-libs \
258 -I$(top_builddir)/gst-libs \
259- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
260- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
261+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
262+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
263 --library=libgsttag-@GST_API_VERSION@.la \
264 --include=Gst-@GST_API_VERSION@ \
265 --include=GstBase-@GST_API_VERSION@ \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]266@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500[diff] [blame]267 $(INTROSPECTION_COMPILER) \
268 --includedir=$(srcdir) \
269 --includedir=$(builddir) \
270- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
271- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
272+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
273+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
274 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
275
276 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]277diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
278index 0f8455f..8c9955c 100644
279--- a/gst-libs/gst/video/Makefile.am
280+++ b/gst-libs/gst/video/Makefile.am
281@@ -119,8 +119,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]282 --c-include "gst/video/video.h" \
283 -I$(top_srcdir)/gst-libs \
284 -I$(top_builddir)/gst-libs \
285- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
286- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
287+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
288+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
289 --library=libgstvideo-@GST_API_VERSION@.la \
290 --include=Gst-@GST_API_VERSION@ \
291 --include=GstBase-@GST_API_VERSION@ \
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]292@@ -147,8 +147,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]293 $(INTROSPECTION_COMPILER) \
294 --includedir=$(srcdir) \
295 --includedir=$(builddir) \
296- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
297- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
298+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
299+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
300 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
301
302 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)