projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 14063f0)
gst-libs: fix up gobject-introspection some more
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Tue, 30 Mar 2010 18:56:56 +0000 (19:56 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Tue, 30 Mar 2010 18:56:56 +0000 (19:56 +0100)
Use new girdir and typlibdir from core .pc files, so we can figure
out the right includes to pass to the gobject-introspection tools,
whether core is installed in the same prefix as gobject-introspection
or in a different prefix or uninstalled. This also keeps us from adding
bogus paths to the includes that only work if core is uninstalled.

Also add some missing includes/pkgs where needed.

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 c58f325..619d1cd 100644 (file)
--- a/gst-libs/gst/app/Makefile.am
+++ b/gst-libs/gst/app/Makefile.am
@@ -47,8 +47,8 @@ GstApp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_MAJORMINOR@
                $(gir_cincludes) \
                -I$(top_srcdir)/gst-libs \
                -I$(top_builddir)/gst-libs \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-base-0.10` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
                --library=gstapp-0.10 \
                --include=Gst-0.10 \
                --include=GstBase-0.10 \
@@ -69,7 +69,12 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst --includedir=`$(PKG_CONFIG) --variable=libdir gstreamer-base-0.10` $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+       $(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` \
+               $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index 669d808..bf5d3dc 100644 (file)
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -75,9 +75,9 @@ GstAudio-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_MAJORMI
                -I$(top_srcdir)/gst-libs \
                -I$(top_builddir)/gst-libs \
                $(gir_cincludes) \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-base-0.10` \
                --add-include-path=$(builddir)/../interfaces \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
                --library=gstaudio-0.10 \
                --include=Gst-0.10 \
                --include=GstBase-0.10 \
@@ -100,7 +100,13 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst --includedir=`$(PKG_CONFIG) --variable=libdir gstreamer-base-0.10` --includedir=$(builddir)/../interfaces $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+               --includedir=$(srcdir) \
+               --includedir=$(builddir) \
+               --includedir=$(builddir)/../interfaces \
+               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-base-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
+               $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
diff --git a/gst-libs/gst/cdda/Makefile.am b/gst-libs/gst/cdda/Makefile.am
index 34b07e6..8c24b1e 100644 (file)
--- a/gst-libs/gst/cdda/Makefile.am
+++ b/gst-libs/gst/cdda/Makefile.am
@@ -28,8 +28,8 @@ GstCdda-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcdda-@GST_MAJORMINO
                --nsversion=@GST_MAJORMINOR@ \
                --strip-prefix=Gst \
                $(gir_cincludes) \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-base-0.10` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
                --add-include-path=$(builddir)/../tag \
                --library=gstcdda-0.10 \
                --include=Gst-0.10 \
@@ -53,7 +53,13 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+               --includedir=$(srcdir) \
+               --includedir=$(builddir) \
+               --includedir=$(builddir)/../tag \
+               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
+               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-base-0.10` \
+               $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
index e481ccc..84c8f00 100644 (file)
--- a/gst-libs/gst/fft/Makefile.am
+++ b/gst-libs/gst/fft/Makefile.am
@@ -57,7 +57,7 @@ GstFft-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_MAJORMINOR@
                --nsversion=@GST_MAJORMINOR@ \
                --strip-prefix=Gst \
                $(gir_cincludes) \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
                --library=gstfft-0.10 \
                --include=Gst-0.10 \
                --libtool="$(top_builddir)/libtool" \
@@ -76,7 +76,11 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+               --includedir=$(srcdir) \
+               --includedir=$(builddir) \
+               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
+               $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am
index 0deacbf..45484d4 100644 (file)
--- a/gst-libs/gst/interfaces/Makefile.am
+++ b/gst-libs/gst/interfaces/Makefile.am
@@ -88,7 +88,7 @@ GstInterfaces-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstinterfaces-@G
                $(gir_cincludes) \
                -I$(top_srcdir)/gst-libs \
                -I$(top_builddir)/gst-libs \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
                --library=gstinterfaces-0.10 \
                --include=Gst-0.10 \
                --libtool="$(top_builddir)/libtool" \
@@ -107,7 +107,11 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+               --includedir=$(srcdir) \
+               --includedir=$(builddir) \
+               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
+               $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
diff --git a/gst-libs/gst/netbuffer/Makefile.am b/gst-libs/gst/netbuffer/Makefile.am
index cc6ec16..a40ea16 100644 (file)
--- a/gst-libs/gst/netbuffer/Makefile.am
+++ b/gst-libs/gst/netbuffer/Makefile.am
@@ -22,7 +22,7 @@ GstNetbuffer-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnetbuffer-@GST
                --nsversion=@GST_MAJORMINOR@ \
                --strip-prefix=Gst \
                $(gir_cincludes) \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
                --library=gstnetbuffer-0.10 \
                --include=Gst-0.10 \
                --libtool="$(top_builddir)/libtool" \
@@ -41,7 +41,11 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+               --includedir=$(srcdir) \
+               --includedir=$(builddir) \
+               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
+               $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
index 41142bf..ada248b 100644 (file)
--- a/gst-libs/gst/pbutils/Makefile.am
+++ b/gst-libs/gst/pbutils/Makefile.am
@@ -64,7 +64,7 @@ GstPbutils-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_MAJ
                $(gir_cincludes) \
                -I$(top_srcdir)/gst-libs \
                -I$(top_builddir)/gst-libs \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
                --library=gstpbutils-0.10 \
                --include=Gst-0.10 \
                --libtool="$(top_builddir)/libtool" \
@@ -83,7 +83,11 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+               --includedir=$(srcdir) \
+               --includedir=$(builddir) \
+               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
+               $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
index 901431c..5f608f2 100644 (file)
--- a/gst-libs/gst/riff/Makefile.am
+++ b/gst-libs/gst/riff/Makefile.am
@@ -32,11 +32,20 @@ GstRiff-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstriff-@GST_MAJORMINO
                --nsversion=@GST_MAJORMINOR@ \
                --strip-prefix=Gst \
                $(gir_cincludes) \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
+               --add-include-path=$(builddir)/../tag \
+               --add-include-path=$(builddir)/../audio \
+               --add-include-path=$(builddir)/../interfaces \
                --library=gstriff-0.10 \
+               --include=GstAudio-0.10 \
+               --include=GstTag-0.10 \
                --include=Gst-0.10 \
                --libtool="$(top_builddir)/libtool" \
                --pkg gstreamer-0.10 \
+               --pkg gstreamer-tag-0.10 \
+               --pkg gstreamer-audio-0.10 \
+               --pkg gstreamer-interfaces-0.10 \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)
@@ -51,7 +60,15 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+               --includedir=$(srcdir) \
+               --includedir=$(builddir) \
+               --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` \
+               $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
index 6e53a6b..a22e958 100644 (file)
--- a/gst-libs/gst/rtp/Makefile.am
+++ b/gst-libs/gst/rtp/Makefile.am
@@ -34,8 +34,8 @@ GstRtp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_MAJORMINOR@
                --strip-prefix=Gst \
                $(gir_cincludes) \
                -I$(top_srcdir)/gst-libs \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-base-0.10` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
                --library=gstrtp-0.10 \
                --include=Gst-0.10 \
                --include=GstBase-0.10 \
@@ -56,7 +56,12 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst --includedir=`$(PKG_CONFIG) --variable=libdir gstreamer-base-0.10` $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+       $(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` \
+               $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
index 7aed919..b472cb8 100644 (file)
--- a/gst-libs/gst/rtsp/Makefile.am
+++ b/gst-libs/gst/rtsp/Makefile.am
@@ -67,8 +67,8 @@ GstRtsp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_MAJORMINO
                $(gir_cincludes) \
                -I$(top_builddir)/gst-libs \
                -I$(top_srcdir)/gst-libs \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \
                --add-include-path=$(builddir)/../sdp \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
                --library=gstrtsp-0.10 \
                --include=Gst-0.10 \
                --include=GstSdp-0.10 \
@@ -89,7 +89,12 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst --includedir=$(builddir)/../sdp $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+               --includedir=$(srcdir) \
+               --includedir=$(builddir) \
+               --includedir=$(builddir)/../sdp \
+               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
+               $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
index 1fa35a1..7496678 100644 (file)
--- a/gst-libs/gst/sdp/Makefile.am
+++ b/gst-libs/gst/sdp/Makefile.am
@@ -25,7 +25,7 @@ GstSdp-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_MAJORMINOR@
                --strip-prefix=Gst \
                $(gir_cincludes) \
                -I$(top_srcdir)/gst-libs \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
                --library=gstsdp-0.10 \
                --include=Gst-0.10 \
                --libtool="$(top_builddir)/libtool" \
@@ -44,7 +44,11 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+       $(AM_V_GEN)$(INTROSPECTION_COMPILER) \
+               --includedir=$(srcdir) \
+               --includedir=$(builddir) \
+               --includedir=`$(PKG_CONFIG) --variable=typelibdir gstreamer-0.10` \
+               $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
index d7073e5..ebc3c75 100644 (file)
--- a/gst-libs/gst/tag/Makefile.am
+++ b/gst-libs/gst/tag/Makefile.am
@@ -31,11 +31,14 @@ GstTag-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_MAJORMINOR@
                --nsversion=@GST_MAJORMINOR@ \
                --strip-prefix=Gst \
                $(gir_cincludes) \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
                --library=gsttag-0.10 \
                --include=Gst-0.10 \
+               --include=GstBase-0.10 \
                --libtool="$(top_builddir)/libtool" \
                --pkg gstreamer-0.10 \
+               --pkg gstreamer-base-0.10 \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)
@@ -50,7 +53,12 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+       $(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` \
+               $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 9921b2e..7cac504 100644 (file)
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -45,8 +45,8 @@ GstVideo-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_MAJORMI
                $(gir_cincludes) \
                -I$(top_srcdir)/gst-libs \
                -I$(top_builddir)/gst-libs \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst \
-               --add-include-path=`$(PKG_CONFIG) --variable=libdir gstreamer-base-0.10` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-0.10` \
+               --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-base-0.10` \
                --library=gstvideo-0.10 \
                --include=Gst-0.10 \
                --include=GstBase-0.10 \
@@ -67,7 +67,12 @@ typelibsdir = $(libdir)/girepository-1.0/
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)$(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=$(builddir) --includedir=`$(PKG_CONFIG) --variable=libdir gstreamer-0.10`/gst --includedir=`$(PKG_CONFIG) --variable=libdir gstreamer-base-0.10` $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+       $(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` \
+               $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 endif
Domain: Multimedia / Media Common;