gir-repository r275 - in trunk: . gir

[johan svn gnome org]

Author: johan
Date: Thu Jan 15 23:09:22 2009
New Revision: 275
URL: http://svn.gnome.org/viewvc/gir-repository?rev=275&view=rev

Log:
2009-01-15  Johan Dahlin  <jdahlin async com br>

    * configure.ac:
    * gir/GL-1.0.gir:
    * gir/Makefile.am:
    * gir/cairo-1.0.gir:
    * gir/fontconfig-2.0.gir:
    * gir/freetype2-2.0.gir:
    * gir/libxml2-2.0.gir:
    * gir/xfixes-4.0.gir:
    * gir/xft-2.0.gir:
    * gir/xlib-2.0.gir:
    Remove girs which moved to gobject-introspection



Removed:
   trunk/gir/GL-1.0.gir
   trunk/gir/cairo-1.0.gir
   trunk/gir/fontconfig-2.0.gir
   trunk/gir/freetype2-2.0.gir
   trunk/gir/libxml2-2.0.gir
   trunk/gir/xfixes-4.0.gir
   trunk/gir/xft-2.0.gir
   trunk/gir/xlib-2.0.gir
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gir/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Jan 15 23:09:22 2009
@@ -33,26 +33,6 @@
 		  have_dbus=true, have_dbus=false)
 AM_CONDITIONAL(BUILD_DBUS, $have_dbus)
 
-dnl xft/xlib
-PKG_CHECK_MODULES(XFT, xft,
-		  have_xft=true, have_xft=false)
-AM_CONDITIONAL(BUILD_XFT, $have_xft)
-
-dnl xft/xlib
-PKG_CHECK_MODULES(XFIXES, xfixes,
-		  have_xfixes=true, have_xfixes=false)
-AM_CONDITIONAL(BUILD_XFIXES, $have_xfixes)
-
-dnl xml
-PKG_CHECK_MODULES(XML, libxml-2.0,
-		  have_libxml=true, have_libxml=false)
-AM_CONDITIONAL(BUILD_LIBXML, $have_libxml)
-
-dnl GL
-AC_CHECK_LIB(GL, glInitNames,
-	     have_gl=true, have_gl=false)
-AM_CONDITIONAL(BUILD_GL, $have_gl)
-
 dnl atk
 PKG_CHECK_MODULES(ATK, atk >= 1.12.0,
                   have_atk=true, have_atk=false)

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Thu Jan 15 23:09:22 2009
@@ -6,13 +6,6 @@
 XPATH_TESTS =
 COMMON_CUSTOM_LDFLAGS= -module -avoid-version -rdynamic
 
-BASE_GIRSOURCES = 		\
-	cairo-1.0.gir 		\
-	fontconfig-2.0.gir	\
-	freetype2-2.0.gir
-CUSTOM_GIRSOURCES += $(BASE_GIRSOURCES)
-EXTRA_DIST += $(BASE_GIRSOURCES)
-
 DBUS_GIROURCES = DBus-1.0.gir
 if BUILD_DBUS
 CUSTOM_GIRSOURCES += $(DBUS_GIROURCES)
@@ -25,18 +18,6 @@
 endif
 EXTRA_DIST += $(AVAHI_GIRSOURCES)
 
-LIBXML_GIRSOURCES = libxml2-2.0.gir
-if BUILD_LIBXML
-CUSTOM_GIRSOURCES += $(LIBXML_GIRSOURCES)
-endif
-EXTRA_DIST += $(LIBXML_GIRSOURCES)
-
-GL_GIRSOURCES = GL-1.0.gir
-if BUILD_GL
-CUSTOM_GIRSOURCES += $(GL_GIRSOURCES)
-endif
-EXTRA_DIST += $(GL_GIRSOURCES)
-
 MISSIONCONTROL_GIRSOURCES = DBusGLib-1.0.gir \
 			    TelepathyGLib.gir \
 			    LibTelepathy.gir
@@ -45,18 +26,6 @@
 endif
 EXTRA_DIST += $(MISSIONCONTROL_GIRSOURCES)
 
-XFT_GIRSOURCES = xft-2.0.gir xlib-2.0.gir
-if BUILD_XFT
-CUSTOM_GIRSOURCES += $(XFT_GIRSOURCES)
-endif
-EXTRA_DIST += $(XFT_GIRSOURCES)
-
-XFIXES_GIRSOURCES = xfixes-4.0.gir xfixes-4.0.gir
-if BUILD_XFIXES
-CUSTOM_GIRSOURCES += $(XFIXES_GIRSOURCES)
-endif
-EXTRA_DIST += $(XFIXES_GIRSOURCES)
-
 if BUILD_GCONF
 GCONF_INCLUDEDIR=`pkg-config --variable=includedir gconf-2.0`/gconf/2
 GConf-2.0.gir: $(G_IR_SCANNER)
@@ -120,7 +89,7 @@
             $(PANGO_INCLUDEDIR)/pango/pango-*.h
 BUILT_GIRSOURCES += Pango-1.0.gir
 
-PangoFT2-1.0.gir: fontconfig-2.0.gir freetype2-2.0.gir Pango-1.0.gir $(G_IR_SCANNER)
+PangoFT2-1.0.gir: Pango-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoFT2 --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
             --include=GObject-2.0 \
@@ -137,7 +106,7 @@
             $(PANGO_INCLUDEDIR)/pango/pangofc-*.h
 BUILT_GIRSOURCES += PangoFT2-1.0.gir
 
-PangoCairo-1.0.gir: cairo-1.0.gir Pango-1.0.gir $(G_IR_SCANNER)
+PangoCairo-1.0.gir: Pango-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoCairo --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
             --include=GObject-2.0 \
@@ -153,7 +122,7 @@
 BUILT_GIRSOURCES += PangoCairo-1.0.gir
 
 if BUILD_PANGOXFT
-PangoXft-1.0.gir: fontconfig-2.0.gir xft-2.0.gir xlib-2.0.gir Pango-1.0.gir PangoFT2-1.0.gir $(G_IR_SCANNER)
+PangoXft-1.0.gir: Pango-1.0.gir PangoFT2-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoXft --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
             --include=GObject-2.0 \
@@ -170,7 +139,7 @@
             $(PANGO_INCLUDEDIR)/pango/pangoxft-render.h
 BUILT_GIRSOURCES += PangoXft-1.0.gir
 
-PangoX-1.0.gir: xlib-2.0.gir Pango-1.0.gir $(G_IR_SCANNER)
+PangoX-1.0.gir: Pango-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoX --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
             --include=GObject-2.0 \
@@ -512,7 +481,7 @@
 # GStreamer
 if BUILD_GSTREAMER
 GST_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-0.10`
-Gst-0.10.gir: libxml2-2.0.gir $(G_IR_SCANNER)
+Gst-0.10.gir: $(G_IR_SCANNER)
 	$(DEBUG) $(G_IR_SCANNER) -v --namespace Gst --nsversion=0.10 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=GObject-2.0 \
@@ -832,7 +801,7 @@
 
 if BUILD_GUPNP
 GUPNP_INCLUDEDIR=`pkg-config --variable=includedir gupnp-1.0`/gupnp-1.0
-GUPnP-1.0.gir: libxml2-2.0.gir GSSDP-1.0.gir Soup-2.0.gir $(G_IR_SCANNER)
+GUPnP-1.0.gir: GSSDP-1.0.gir Soup-2.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace GUPnP --nsversion=1.0 \
 	     --add-include-path=$(srcdir) --add-include-path=. \
              --include=GObject-2.0 \