projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c53ef04)
gobject-introspection: use same PKG_CONFIG_PATH for g-ir-compiler as for g-ir-scanner
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 8 Jan 2011 02:10:03 +0000 (02:10 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 8 Jan 2011 02:10:03 +0000 (02:10 +0000)
Make sure to use the PKG_CONFIG_PATH set at configure time instead of
just relying on an env-var set one. This makes sure both g-ir-compiler
and g-ir-scanner use the same PKG_CONFIG_PATH for determining include
paths etc.

13 files changed:
gst-libs/gst/app/Makefile.am patch | blob | history
gst-libs/gst/audio/Makefile.am patch | blob | history
gst-libs/gst/cdda/Makefile.am patch | blob | history
gst-libs/gst/fft/Makefile.am patch | blob | history
gst-libs/gst/interfaces/Makefile.am patch | blob | history
gst-libs/gst/netbuffer/Makefile.am patch | blob | history
gst-libs/gst/pbutils/Makefile.am patch | blob | history
gst-libs/gst/riff/Makefile.am patch | blob | history
gst-libs/gst/rtp/Makefile.am patch | blob | history
gst-libs/gst/rtsp/Makefile.am patch | blob | history
gst-libs/gst/sdp/Makefile.am patch | blob | history
gst-libs/gst/tag/Makefile.am patch | blob | history
gst-libs/gst/video/Makefile.am patch | blob | history

diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
index 8848a7d..cf2c852 100644 (file)
--- a/gst-libs/gst/app/Makefile.am
+++ b/gst-libs/gst/app/Makefile.am
@@ -70,7 +70,8 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index 4411683..b449e24 100644 (file)
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -101,7 +101,8 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir=$(builddir)/../interfaces \
diff --git a/gst-libs/gst/cdda/Makefile.am b/gst-libs/gst/cdda/Makefile.am
index 31bae21..5985c84 100644 (file)
--- a/gst-libs/gst/cdda/Makefile.am
+++ b/gst-libs/gst/cdda/Makefile.am
@@ -54,7 +54,8 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir=$(builddir)/../tag \
diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
index 046d4d9..bf14e55 100644 (file)
--- a/gst-libs/gst/fft/Makefile.am
+++ b/gst-libs/gst/fft/Makefile.am
@@ -77,7 +77,8 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am
index e262448..eca6a80 100644 (file)
--- a/gst-libs/gst/interfaces/Makefile.am
+++ b/gst-libs/gst/interfaces/Makefile.am
@@ -108,7 +108,8 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
diff --git a/gst-libs/gst/netbuffer/Makefile.am b/gst-libs/gst/netbuffer/Makefile.am
index 5a78b9d..9f70a39 100644 (file)
--- a/gst-libs/gst/netbuffer/Makefile.am
+++ b/gst-libs/gst/netbuffer/Makefile.am
@@ -42,7 +42,8 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
index fea84c4..82a10bf 100644 (file)
--- a/gst-libs/gst/pbutils/Makefile.am
+++ b/gst-libs/gst/pbutils/Makefile.am
@@ -105,7 +105,8 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(srcdir)/../video \
                --includedir=$(builddir) \
diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
index 879f980..5da50d6 100644 (file)
--- a/gst-libs/gst/riff/Makefile.am
+++ b/gst-libs/gst/riff/Makefile.am
@@ -61,7 +61,8 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir=$(builddir)/../tag \
diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
index 9c98366..36a423a 100644 (file)
--- a/gst-libs/gst/rtp/Makefile.am
+++ b/gst-libs/gst/rtp/Makefile.am
@@ -57,7 +57,8 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
index 65777a7..87a2ecd 100644 (file)
--- a/gst-libs/gst/rtsp/Makefile.am
+++ b/gst-libs/gst/rtsp/Makefile.am
@@ -90,7 +90,8 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir=$(builddir)/../sdp \
diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
index b122f2f..fd8017e 100644 (file)
--- a/gst-libs/gst/sdp/Makefile.am
+++ b/gst-libs/gst/sdp/Makefile.am
@@ -45,7 +45,8 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
index aac1c13..9e82463 100644 (file)
--- a/gst-libs/gst/tag/Makefile.am
+++ b/gst-libs/gst/tag/Makefile.am
@@ -54,7 +54,8 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 8a9019c..26d5d1b 100644 (file)
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -68,7 +68,8 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
+               $(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
Domain: Multimedia / Media Common;