From b37c993e4eed0481b0020a103e18662255f407b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 30 Mar 2010 23:44:51 +0100 Subject: [PATCH] gst-libs: more gobject-introspection fixes Use right .pc file variable for compiler includes this time: g-ir-compiler wants the girdirs not the typelibdirs as includes. --- gst-libs/gst/app/Makefile.am | 4 ++-- gst-libs/gst/audio/Makefile.am | 4 ++-- gst-libs/gst/cdda/Makefile.am | 4 ++-- gst-libs/gst/fft/Makefile.am | 2 +- gst-libs/gst/interfaces/Makefile.am | 2 +- gst-libs/gst/netbuffer/Makefile.am | 2 +- gst-libs/gst/pbutils/Makefile.am | 2 +- gst-libs/gst/riff/Makefile.am | 4 ++-- gst-libs/gst/rtp/Makefile.am | 4 ++-- gst-libs/gst/rtsp/Makefile.am | 2 +- gst-libs/gst/sdp/Makefile.am | 2 +- gst-libs/gst/tag/Makefile.am | 4 ++-- gst-libs/gst/video/Makefile.am | 4 ++-- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am index 619d1cd492..31e538734e 100644 --- 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 bf5d3dcdd9..9db5fb2a79 100644 --- 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 8c24b1e6bd..03f9cc6fde 100644 --- 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 84c8f006f1..770f524869 100644 --- 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 45484d4115..373191c4e9 100644 --- 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 a40ea160df..b4d41713e9 100644 --- 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 ada248b6a9..15b92fbcbf 100644 --- 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 5f608f2ece..79e871bec6 100644 --- 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 a22e9587cf..82a15a68cc 100644 --- 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 b472cb8382..3e940a76fd 100644 --- 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 7496678284..c94743f3b5 100644 --- 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 ebc3c75707..deaf88d77b 100644 --- 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 7cac5040f1..cfccb22449 100644 --- 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)