gir-repository r232 - in trunk: . gir



Author: johan
Date: Tue Nov 25 20:59:21 2008
New Revision: 232
URL: http://svn.gnome.org/viewvc/gir-repository?rev=232&view=rev

Log:
2008-11-25  Johan Dahlin  <jdahlin async com br>

	* configure.ac:
	* gir/Makefile.am:
	Check for GStreamer plugins base before building
	a bunch of girs.



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gir/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Nov 25 20:59:21 2008
@@ -162,6 +162,12 @@
                   have_gstreamer=true, have_gstreamer=false)
 AM_CONDITIONAL(BUILD_GSTREAMER, $have_gstreamer)
 
+dnl gstreamer
+PKG_CHECK_MODULES(GSTREAMER_PLUGINS_BASE, gstreamer-plugins-base-0.10 >= 0.10.0, 
+                  have_gstreamer_plugins_base=true, 
+                  have_gstreamer_plugins_base=false)
+AM_CONDITIONAL(BUILD_GSTREAMER_PLUGINS_BASE, $have_gstreamer_plugins_base)
+
 dnl gtksourceview
 PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-2.0,
                   have_gtksourceview=true, have_gtksourceview=false)

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Tue Nov 25 20:59:21 2008
@@ -504,10 +504,11 @@
              --include=GObject-2.0 \
              --include=GModule-2.0 \
              --include=libxml2-2.0 \
-	     --library=gstreamer-0.10 \
+	     --library=gstbase-0.10 \
 	     $(NOCLOSURE) \
              --pkg gobject-2.0 \
              --pkg gstreamer-0.10 \
+             --pkg gstreamer-base-0.10 \
              --output $@ \
 	     -I$(GST_INCLUDEDIR) \
 	     $(GST_INCLUDEDIR)/gst/gstbin.h \
@@ -561,26 +562,10 @@
 	     $(GST_INCLUDEDIR)/gst/gstutils.h \
 	     $(GST_INCLUDEDIR)/gst/gstvalue.h \
 	     $(GST_INCLUDEDIR)/gst/gstversion.h \
-	     $(GST_INCLUDEDIR)/gst/gstxml.h
+	     $(GST_INCLUDEDIR)/gst/gstxml.h \
+	     $(GST_INCLUDEDIR)/gst/base/*.h
 BUILT_GIRSOURCES += Gst-0.10.gir
 
-GSTAUDIO_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-audio-0.10`
-GstAudio-0.10.gir: GstBase-0.10.gir GstInterfaces-0.10.gir $(G_IR_SCANNER)
-	$(DEBUG) $(G_IR_SCANNER) -v --namespace GstAudio --nsversion=0.10 \
-	    --add-include-path=$(srcdir) --add-include-path=. \
-             --include=Gst-0.10 \
-             --include=GstBase-0.10 \
-             --include=GstInterfaces-0.10 \
-	     --library=gstaudio-0.10 \
-	     $(NOCLOSURE) \
-             --pkg gobject-2.0 \
-             --pkg gstreamer-0.10 \
-             --pkg gstreamer-audio-0.10 \
-             --output $@ \
-	     -I$(GSTAUDIO_INCLUDEDIR) \
-	     $(GSTAUDIO_INCLUDEDIR)/gst/audio/*h
-BUILT_GIRSOURCES += GstAudio-0.10.gir
-
 GSTBASE_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-base-0.10`
 GstBase-0.10.gir: Gst-0.10.gir $(G_IR_SCANNER)
 	$(DEBUG) $(G_IR_SCANNER) -v --namespace GstBase --nsversion=0.10 \
@@ -627,6 +612,42 @@
 # Bug in GstDPVersion enum name parsing
 #BUILT_GIRSOURCES += GstDataprotocol-0.10.gir
 
+GSTNET_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-net-0.10`
+GstNet-0.10.gir: Gst-0.10.gir $(G_IR_SCANNER)
+	$(DEBUG) $(G_IR_SCANNER) -v --namespace GstNet --nsversion=0.10 \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+             --include=Gst-0.10 \
+	     --library=gstnet-0.10 \
+	     $(NOCLOSURE) \
+             --pkg gobject-2.0 \
+             --pkg gstreamer-0.10 \
+             --pkg gstreamer-net-0.10 \
+             --output $@ \
+	     -I$(GSTNET_INCLUDEDIR) \
+	     $(GSTNET_INCLUDEDIR)/gst/net/*h
+# Missing socklen_t in scanner
+#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 $(G_IR_SCANNER)
+	$(DEBUG) $(G_IR_SCANNER) -v --namespace GstAudio --nsversion=0.10 \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+             --include=Gst-0.10 \
+             --include=GstBase-0.10 \
+             --include=GstInterfaces-0.10 \
+	     --library=gstaudio-0.10 \
+	     $(NOCLOSURE) \
+             --pkg gobject-2.0 \
+             --pkg gstreamer-0.10 \
+             --pkg gstreamer-audio-0.10 \
+             --output $@ \
+	     -I$(GSTAUDIO_INCLUDEDIR) \
+	     $(GSTAUDIO_INCLUDEDIR)/gst/audio/*h
+BUILT_GIRSOURCES += GstAudio-0.10.gir
+
 GSTFFT_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-fft-0.10`
 GstFft-0.10.gir: Gst-0.10.gir $(G_IR_SCANNER)
 	$(DEBUG) $(G_IR_SCANNER) -v --namespace GstFft --nsversion=0.10 \
@@ -657,22 +678,6 @@
 	     $(GSTINTERFACES_INCLUDEDIR)/gst/interfaces/*h
 BUILT_GIRSOURCES += GstInterfaces-0.10.gir
 
-GSTNET_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-net-0.10`
-GstNet-0.10.gir: Gst-0.10.gir $(G_IR_SCANNER)
-	$(DEBUG) $(G_IR_SCANNER) -v --namespace GstNet --nsversion=0.10 \
-	    --add-include-path=$(srcdir) --add-include-path=. \
-             --include=Gst-0.10 \
-	     --library=gstnet-0.10 \
-	     $(NOCLOSURE) \
-             --pkg gobject-2.0 \
-             --pkg gstreamer-0.10 \
-             --pkg gstreamer-net-0.10 \
-             --output $@ \
-	     -I$(GSTNET_INCLUDEDIR) \
-	     $(GSTNET_INCLUDEDIR)/gst/net/*h
-# Missing socklen_t in scanner
-#BUILT_GIRSOURCES += GstNet-0.10.gir
-
 GSTNETBUFFER_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-netbuffer-0.10`
 GstNetbuffer-0.10.gir: Gst-0.10.gir $(G_IR_SCANNER)
 	$(DEBUG) $(G_IR_SCANNER) -v --namespace GstNetbuffer --nsversion=0.10 \
@@ -796,7 +801,7 @@
 	     $(GSTVIDEO_INCLUDEDIR)/gst/video/*h
 BUILT_GIRSOURCES += GstVideo-0.10.gir
 
-endif BUILD_GSTREAMER
+endif BUILD_GSTREAMER_PLUGINS_BASE
 
 if BUILD_MISSIONCONTROL
 MISSIONCONTROL_INCLUDEDIR=`pkg-config --variable=includedir libmissioncontrol`



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]