projects / platform / upstream / gstreamer.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 619d1cd..31e5387 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 bf5d3dc..9db5fb2 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 8c24b1e..03f9cc6 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 84c8f00..770f524 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 45484d4..373191c 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 a40ea16..b4d4171 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 ada248b..15b92fb 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 5f608f2..79e871b 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 a22e958..82a15a6 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 b472cb8..3e940a7 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 7496678..c94743f 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 ebc3c75..deaf88d 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 7cac504..cfccb22 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;