projects / platform / upstream / gst-plugins-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fcd32fa)
gst-libs: more gobject-introspection fixes
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Tue, 30 Mar 2010 22:44:51 +0000 (23:44 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Tue, 30 Mar 2010 22:46:10 +0000 (23:46 +0100)
Use right .pc file variable for compiler includes this time:
g-ir-compiler wants the girdirs not the typelibdirs as includes.

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 619d1cd492d27a7ce75f67b82ee7a860514377ba..31e538734e28d7d80e0d57cc53509ed6a715c0cb 100644 (file)
--- a/gst-libs/gst/app/Makefile.am
+++ b/gst-libs/gst/app/Makefile.am
@@ -72,8 +72,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
        $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-base-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index bf5d3dcdd922048b40c41f1a94034d0ce7e8283f..9db5fb2a79322040f061cdf40d24d7f37ead5dce 100644 (file)
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -104,8 +104,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir=$(builddir)/../interfaces \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-base-0.10` \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/gst-libs/gst/cdda/Makefile.am b/gst-libs/gst/cdda/Makefile.am
index 8c24b1e6bd5df3c92ada7060de8a66c26012673f..03f9cc6fdeb393dd9349377a48fdba0762b274f4 100644 (file)
--- a/gst-libs/gst/cdda/Makefile.am
+++ b/gst-libs/gst/cdda/Makefile.am
@@ -57,8 +57,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir=$(builddir)/../tag \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-base-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
index 84c8f006f1d78d16a6b40036e9aa8e34e99e88af..770f5248696d3435b8e5a0a63766a60618245e3f 100644 (file)
--- a/gst-libs/gst/fft/Makefile.am
+++ b/gst-libs/gst/fft/Makefile.am
@@ -79,7 +79,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
        $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am
index 45484d4115b21ec0c0eabeb55ce12da4918e5922..373191c4e96456a1ac05920ba9247ec69b96bc89 100644 (file)
--- a/gst-libs/gst/interfaces/Makefile.am
+++ b/gst-libs/gst/interfaces/Makefile.am
@@ -110,7 +110,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
        $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/gst-libs/gst/netbuffer/Makefile.am b/gst-libs/gst/netbuffer/Makefile.am
index a40ea160dfeaadc92b34cf07fa40276239500acc..b4d41713e919264599829e05e4071445de9a065a 100644 (file)
--- a/gst-libs/gst/netbuffer/Makefile.am
+++ b/gst-libs/gst/netbuffer/Makefile.am
@@ -44,7 +44,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
        $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
index ada248b6a97777a22ea3f94aad63ebdc0aa7af13..15b92fbcbf190c81bbd86680e592c0040ff21a29 100644 (file)
--- a/gst-libs/gst/pbutils/Makefile.am
+++ b/gst-libs/gst/pbutils/Makefile.am
@@ -86,7 +86,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
        $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
index 5f608f2ece088a1de202c87578b8b05353ef8e32..79e871bec642fd0e0d4083d58b3a1495d460e837 100644 (file)
--- a/gst-libs/gst/riff/Makefile.am
+++ b/gst-libs/gst/riff/Makefile.am
@@ -66,8 +66,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
                --includedir=$(builddir)/../tag \
                --includedir=$(builddir)/../audio \
                --includedir=$(builddir)/../interfaces \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-base-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
index a22e9587cf898c81f1b4e33f7bf654bd24c62b29..82a15a68cc2486ee69074e19670fd3a2984ff8c5 100644 (file)
--- a/gst-libs/gst/rtp/Makefile.am
+++ b/gst-libs/gst/rtp/Makefile.am
@@ -59,8 +59,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
        $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-base-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
index b472cb83827d51dcaaa25cd2dff0659d0ee6b348..3e940a76fd9c0ecb3b97a6bc54ad7e5267ce6954 100644 (file)
--- a/gst-libs/gst/rtsp/Makefile.am
+++ b/gst-libs/gst/rtsp/Makefile.am
@@ -93,7 +93,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
                --includedir=$(builddir)/../sdp \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
index 74966782842e229b50bc36761426abe461172bd1..c94743f3b5a5ed6859c2953952a65a8fb2bff6c1 100644 (file)
--- a/gst-libs/gst/sdp/Makefile.am
+++ b/gst-libs/gst/sdp/Makefile.am
@@ -47,7 +47,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
        $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
index ebc3c75707e3826c35f6158e787dc9b0883bed7a..deaf88d77b54208b9ebbaebf74068c55c594b7f5 100644 (file)
--- a/gst-libs/gst/tag/Makefile.am
+++ b/gst-libs/gst/tag/Makefile.am
@@ -56,8 +56,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
        $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-base-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 7cac5040f1210992235e851c17b3563536ae35c2..cfccb224492d05f0115a6222d1526d04af991ceb 100644 (file)
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -70,8 +70,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
        $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
                --includedir=$(srcdir) \
                --includedir=$(builddir) \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
-               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-base-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
                $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
Domain: Multimedia / Media Common;