gir-repository r169 - in trunk: . gir

[tko svn gnome org]

Author: tko
Date: Mon Oct 27 11:29:17 2008
New Revision: 169
URL: http://svn.gnome.org/viewvc/gir-repository?rev=169&view=rev

Log:
Make Gdk depend on xlib-2.0 only with the x11 gdk target

	* configure.ac:
	* gir/Makefile.am: Make Gdk depend on xlib-2.0 only with the x11
	gdk target

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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Oct 27 11:29:17 2008
@@ -76,10 +76,15 @@
                   have_gtk=true, have_gtk=false)
 AM_CONDITIONAL(BUILD_GTK, $have_gtk)
 GDK_TARGET=
+GDK_TARGET_GIRS=
 if $have_gtk; then
     GDK_TARGET="$($PKG_CONFIG --variable=target gtk+-2.0)"
+    if test "$GDK_TARGET" = x11; then
+        GDK_TARGET_GIRS=xlib-2.0
+    fi
 fi
 AC_SUBST(GDK_TARGET)
+AC_SUBST(GDK_TARGET_GIRS)
 
 dnl gconf
 PKG_CHECK_MODULES(GCONF, gconf-2.0,

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Mon Oct 27 11:29:17 2008
@@ -248,13 +248,13 @@
 
 GDK_INCLUDEDIR=`pkg-config --variable=includedir gdk-$(GDK_TARGET)-2.0`/gtk-2.0
 GDK_LIBDIR=`pkg-config --variable=libdir gdk-$(GDK_TARGET)-2.0`
-Gdk-2.0.gir: $(srcdir)/cairo-1.0.gir Pango-1.0.gir xlib-2.0.gir GdkPixbuf-2.0.gir $(G_IR_SCANNER)
+Gdk-2.0.gir: $(srcdir)/cairo-1.0.gir Pango-1.0.gir $(GDK_TARGET_GIRS:%=%.gir) GdkPixbuf-2.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Gdk --nsversion=2.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gio-2.0 \
              --include=cairo-1.0 \
              --include=Pango-1.0 \
-             --include=xlib-2.0 \
+	     $(GDK_TARGET_GIRS:%=--include=%) \
              --include=GdkPixbuf-2.0 \
 	     --library=gdk-$(GDK_TARGET)-2.0 \
 	     $(NOCLOSURE) \
@@ -288,7 +288,7 @@
 
 GTK_INCLUDEDIR=`pkg-config --variable=includedir gtk+-$(GDK_TARGET)-2.0`/gtk-2.0
 GTK_LIBDIR=`pkg-config --variable=libdir gtk+-$(GDK_TARGET)-2.0`
-Gtk-2.0.gir: $(srcdir)/cairo-1.0.gir Pango-1.0.gir Atk-1.0.gir xlib-2.0.gir GdkPixbuf-2.0.gir Gdk-2.0.gir $(G_IR_SCANNER)
+Gtk-2.0.gir: $(srcdir)/cairo-1.0.gir Pango-1.0.gir Atk-1.0.gir $(GDK_TARGET_GIRS:%=%.gir) GdkPixbuf-2.0.gir Gdk-2.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Gtk --nsversion=2.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gio-2.0 \