[gir-repository] Fix the GStreamer build to work with the latest scanner

[Johan Dahlin <johan src gnome org>]

commit da0663fc8f998337b920e4ee8a4ecfdb46d6fd70
Author: Johan Dahlin <johan gnome org>
Date:   Tue Sep 7 12:54:57 2010 -0300

    Fix the GStreamer build to work with the latest scanner

 gir/Makefile.am |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/gir/Makefile.am b/gir/Makefile.am
index 35ef73d..de40c00 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -425,7 +425,7 @@ BUILT_GIRSOURCES += GooCanvas-0.10.gir
 endif BUILD_GOOCANVAS
 
 # GStreamer
-if BUILD_GSTREAMER
+if BUILD_GSTREAMER_PLUGINS_BASE
 GST_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-0.10`
 
 GST_HEADER_FILES = \
@@ -526,6 +526,7 @@ BUILT_GIRSOURCES += GstBase-0.10.gir
 GSTCONTROLLER_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-controller-0.10`
 GstController-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
 	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstController --nsversion=0.10 \
+	    --identifier-prefix=Gst --symbol-prefix=gst \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gst-0.10 \
 	     --library=gstcontroller-0.10 \
@@ -541,6 +542,7 @@ BUILT_GIRSOURCES += GstController-0.10.gir
 GSTDATAPROTOCOL_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-dataprotocol-0.10`
 GstDataprotocol-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
 	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstDataprotocol --nsversion=0.10 \
+	    --identifier-prefix=Gst --symbol-prefix=gst \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gst-0.10 \
 	     --library=gstdataprotocol-0.10 \
@@ -557,6 +559,7 @@ GstDataprotocol-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
 GSTNET_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-net-0.10`
 GstNet-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
 	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstNet --nsversion=0.10 \
+	    --identifier-prefix=Gst --symbol-prefix=gst \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gst-0.10 \
 	     --library=gstnet-0.10 \
@@ -569,12 +572,10 @@ GstNet-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
 	     $(GSTNET_INCLUDEDIR)/gst/net/*h
 BUILT_GIRSOURCES += GstNet-0.10.gir
 
-endif BUILD_GSTREAMER
-
-if BUILD_GSTREAMER_PLUGINS_BASE
 GSTAUDIO_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-audio-0.10`
 GstAudio-0.10.gir: GstBase-0.10.gir GstInterfaces-0.10.gir $(INTROSPECTION_SCANNER)
 	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstAudio --nsversion=0.10 \
+	    --identifier-prefix=Gst --symbol-prefix=gst \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gst-0.10 \
              --include=GstBase-0.10 \
@@ -592,6 +593,7 @@ BUILT_GIRSOURCES += GstAudio-0.10.gir
 GSTFFT_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-fft-0.10`
 GstFft-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
 	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstFft --nsversion=0.10 \
+	    --identifier-prefix=Gst --symbol-prefix=gst \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gst-0.10 \
 	     --library=gstfft-0.10 \
@@ -607,6 +609,7 @@ BUILT_GIRSOURCES += GstFft-0.10.gir
 GSTINTERFACES_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-interfaces-0.10`
 GstInterfaces-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
 	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstInterfaces --nsversion=0.10 \
+	    --identifier-prefix=Gst --symbol-prefix=gst \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gst-0.10 \
 	     --library=gstinterfaces-0.10 \
@@ -622,6 +625,7 @@ BUILT_GIRSOURCES += GstInterfaces-0.10.gir
 GSTNETBUFFER_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-netbuffer-0.10`
 GstNetbuffer-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
 	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstNetbuffer --nsversion=0.10 \
+	    --identifier-prefix=Gst --symbol-prefix=gst \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gst-0.10 \
 	     --library=gstnetbuffer-0.10 \
@@ -637,6 +641,7 @@ BUILT_GIRSOURCES += GstNetbuffer-0.10.gir
 GSTPBUTILS_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-pbutils-0.10`
 GstPbutils-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
 	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstPbutils --nsversion=0.10 \
+	    --identifier-prefix=Gst --symbol-prefix=gst \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gst-0.10 \
 	     --library=gstpbutils-0.10 \
@@ -652,6 +657,7 @@ BUILT_GIRSOURCES += GstPbutils-0.10.gir
 GSTRIFF_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-riff-0.10`
 GstRiff-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
 	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstRiff --nsversion=0.10 \
+	    --identifier-prefix=Gst --symbol-prefix=gst \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gst-0.10 \
 	     --library=gstriff-0.10 \
@@ -667,6 +673,7 @@ BUILT_GIRSOURCES += GstRiff-0.10.gir
 GSTRTP_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-rtp-0.10`
 GstRtp-0.10.gir: GstBase-0.10.gir Gst-0.10.gir $(INTROSPECTION_SCANNER)
 	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstRtp --nsversion=0.10 \
+	    --identifier-prefix=Gst --symbol-prefix=gst \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gst-0.10 \
              --include=GstBase-0.10 \
@@ -683,6 +690,7 @@ BUILT_GIRSOURCES += GstRtp-0.10.gir
 GSTRTSP_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-rtsp-0.10`
 GstRtsp-0.10.gir: GstSdp-0.10.gir Gst-0.10.gir $(INTROSPECTION_SCANNER)
 	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstRtsp --nsversion=0.10 \
+	    --identifier-prefix=GstRTSP --symbol-prefix=gst \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gst-0.10 \
              --include=GstSdp-0.10 \
@@ -699,6 +707,7 @@ BUILT_GIRSOURCES += GstRtsp-0.10.gir
 GSTSDP_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-sdp-0.10`
 GstSdp-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
 	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstSdp --nsversion=0.10 \
+	    --identifier-prefix=Gst --symbol-prefix=gst \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gst-0.10 \
 	     --library=gstsdp-0.10 \
@@ -714,6 +723,7 @@ BUILT_GIRSOURCES += GstSdp-0.10.gir
 GSTTAG_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-tag-0.10`
 GstTag-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
 	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstTag --nsversion=0.10 \
+	    --identifier-prefix=Gst --symbol-prefix=gst \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gst-0.10 \
 	     --library=gsttag-0.10 \
@@ -729,6 +739,7 @@ BUILT_GIRSOURCES += GstTag-0.10.gir
 GSTVIDEO_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-video-0.10`
 GstVideo-0.10.gir: Gst-0.10.gir GstBase-0.10.gir $(INTROSPECTION_SCANNER)
 	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstVideo --nsversion=0.10 \
+	    --identifier-prefix=Gst --symbol-prefix=gst \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gst-0.10 \
              --include=GstBase-0.10 \