GNOME.org
 

gir-repository r247 - trunk/gir

Author: johan
Date: Wed Nov 26 02:23:45 2008
New Revision: 247
URL: http://svn.gnome.org/viewvc/gir-repository?rev=247&view=rev

Log:
Search for girs in srcdir if they're not found in builddir,
fixes builddir != srcdir


Modified:
   trunk/gir/Makefile.am

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Wed Nov 26 02:23:45 2008
@@ -12,33 +12,33 @@
 XPATH_TESTS =
 
 if BUILD_DBUS
-CUSTOM_GIRSOURCES += $(srcdir)/DBus-1.0.gir
+CUSTOM_GIRSOURCES += DBus-1.0.gir
 endif
 
 if BUILD_AVAHI
-CUSTOM_GIRSOURCES += $(srcdir)/AvahiCore-0.6.gir
+CUSTOM_GIRSOURCES += AvahiCore-0.6.gir
 endif
 
 if BUILD_LIBXML
-CUSTOM_GIRSOURCES += $(srcdir)/libxml2-2.0.gir
+CUSTOM_GIRSOURCES += libxml2-2.0.gir
 endif
 
 if BUILD_GL
-CUSTOM_GIRSOURCES += $(srcdir)/GL-1.0.gir
+CUSTOM_GIRSOURCES += GL-1.0.gir
 endif
 
 if BUILD_MISSIONCONTROL
-CUSTOM_GIRSOURCES += $(srcdir)/DBusGLib-1.0.gir \
-	$(srcdir)/TelepathyGLib.gir \
-	$(srcdir)/LibTelepathy.gir
+CUSTOM_GIRSOURCES += DBusGLib-1.0.gir \
+	TelepathyGLib.gir \
+	LibTelepathy.gir
 endif
 
 if BUILD_XFT
-CUSTOM_GIRSOURCES += $(srcdir)/xft-2.0.gir $(srcdir)/xlib-2.0.gir
+CUSTOM_GIRSOURCES += xft-2.0.gir xlib-2.0.gir
 endif
 
 if BUILD_XFIXES
-CUSTOM_GIRSOURCES += $(srcdir)/xfixes-4.0.gir $(srcdir)/xfixes-4.0.gir
+CUSTOM_GIRSOURCES += xfixes-4.0.gir xfixes-4.0.gir
 endif
 
 if BUILD_GCONF
@@ -108,7 +108,7 @@
             $(PANGO_INCLUDEDIR)/pango/pango-*.h
 BUILT_GIRSOURCES += Pango-1.0.gir
 
-PangoFT2-1.0.gir: $(srcdir)/fontconfig-2.0.gir $(srcdir)/freetype2-2.0.gir Pango-1.0.gir $(G_IR_SCANNER)
+PangoFT2-1.0.gir: fontconfig-2.0.gir freetype2-2.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 \
@@ -126,7 +126,7 @@
             $(PANGO_INCLUDEDIR)/pango/pangofc-*.h
 BUILT_GIRSOURCES += PangoFT2-1.0.gir
 
-PangoCairo-1.0.gir: $(srcdir)/cairo-1.0.gir Pango-1.0.gir $(G_IR_SCANNER)
+PangoCairo-1.0.gir: cairo-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 \
@@ -143,7 +143,7 @@
 BUILT_GIRSOURCES += PangoCairo-1.0.gir
 
 if BUILD_PANGOXFT
-PangoXft-1.0.gir: $(srcdir)/fontconfig-2.0.gir $(srcdir)/xft-2.0.gir $(srcdir)/xlib-2.0.gir Pango-1.0.gir PangoFT2-1.0.gir $(G_IR_SCANNER)
+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)
 	$(G_IR_SCANNER) -v --namespace PangoXft --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
             --include=GObject-2.0 \
@@ -161,7 +161,7 @@
             $(PANGO_INCLUDEDIR)/pango/pangoxft-render.h
 BUILT_GIRSOURCES += PangoXft-1.0.gir
 
-PangoX-1.0.gir: $(srcdir)/xlib-2.0.gir Pango-1.0.gir $(G_IR_SCANNER)
+PangoX-1.0.gir: xlib-2.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 \
@@ -247,7 +247,7 @@
 	Gdk-custom.h
 
 GDK_INCLUDEDIR=`pkg-config --variable=includedir gdk-$(GDK_TARGET)-2.0`/gtk-2.0
-Gdk-2.0.gir: $(srcdir)/cairo-1.0.gir Pango-1.0.gir $(GDK_TARGET_GIRS:%=%.gir) GdkPixbuf-2.0.gir libgirepo-Gdk-custom.la $(G_IR_SCANNER)
+Gdk-2.0.gir: cairo-1.0.gir Pango-1.0.gir $(GDK_TARGET_GIRS:%=%.gir) GdkPixbuf-2.0.gir libgirepo-Gdk-custom.la $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Gdk --nsversion=2.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gio-2.0 \
@@ -287,7 +287,7 @@
 	Gtk-custom.h
 
 GTK_INCLUDEDIR=`pkg-config --variable=includedir gtk+-$(GDK_TARGET)-2.0`/gtk-2.0
-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 libgirepo-Gtk-custom.la $(G_IR_SCANNER)
+Gtk-2.0.gir: cairo-1.0.gir Pango-1.0.gir Atk-1.0.gir $(GDK_TARGET_GIRS:%=%.gir) GdkPixbuf-2.0.gir Gdk-2.0.gir libgirepo-Gtk-custom.la $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Gtk --nsversion=2.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gio-2.0 \
@@ -321,7 +321,7 @@
 # webkit
 if BUILD_WEBKIT
 WEBKIT_INCLUDEDIR=`pkg-config --variable=includedir webkit-1.0`
-WebKit-1.0.gir: $(srcdir)/JSCore-1.0.gir Gtk-2.0.gir $(G_IR_SCANNER)
+WebKit-1.0.gir: JSCore-1.0.gir Gtk-2.0.gir $(G_IR_SCANNER)
 	$(DEBUG) $(G_IR_SCANNER) -v --namespace WebKit --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=GObject-2.0 \
@@ -336,7 +336,7 @@
 	     -I$(WEBKIT_INCLUDEDIR) \
              $(WEBKIT_INCLUDEDIR)/webkit-1.0/webkit/*.h
 BUILT_GIRSOURCES += WebKit-1.0.gir
-CUSTOM_GIRSOURCES += $(srcdir)/JSCore-1.0.gir
+CUSTOM_GIRSOURCES += JSCore-1.0.gir
 XPATH_TESTS += WebKit-1.0.xpath
 endif BUILD_WEBKIT
 
@@ -470,7 +470,7 @@
 
 if BUILD_CLUTTERCAIRO
 CLUTTERCAIRO_INCLUDEDIR=`pkg-config --variable=includedir clutter-cairo-0.8`
-ClutterCairo-0.8.gir: Clutter-0.8.gir $(srcdir)/cairo-1.0.gir $(G_IR_SCANNER)
+ClutterCairo-0.8.gir: Clutter-0.8.gir cairo-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace ClutterCairo --nsversion=0.8 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=cairo-1.0 \
@@ -505,7 +505,7 @@
 # GStreamer
 if BUILD_GSTREAMER
 GST_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-0.10`
-Gst-0.10.gir: $(srcdir)/libxml2-2.0.gir $(G_IR_SCANNER)
+Gst-0.10.gir: libxml2-2.0.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 \
@@ -843,7 +843,7 @@
 
 if BUILD_GUPNP
 GUPNP_INCLUDEDIR=`pkg-config --variable=includedir gupnp-1.0`/gupnp-1.0
-Gupnp-1.0.gir: $(srcdir)/libxml2-2.0.gir GSSDP-1.0.gir Soup-2.0.gir $(G_IR_SCANNER)
+Gupnp-1.0.gir: libxml2-2.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 \
@@ -862,7 +862,7 @@
 
 if BUILD_AVAHI
 AVAHI_INCLUDEDIR=`pkg-config --variable=includedir avahi-gobject`/avahi-gobject
-Avahi-0.6.gir: $(srcdir)/AvahiCore-0.6.gir $(G_IR_SCANNER)
+Avahi-0.6.gir: AvahiCore-0.6.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace Avahi --nsversion=0.6 \
 	     --strip-prefix=Ga \
 	     --add-include-path=$(srcdir) --add-include-path=. \
@@ -875,7 +875,7 @@
 	     -I$(AVAHI_INCLUDEDIR) \
              $(AVAHI_INCLUDEDIR)/*.h
 BUILT_GIRSOURCES += Avahi-0.6.gir
-CUSTOM_GIRSOURCES += $(srcdir)/AvahiCore-0.6.gir
+CUSTOM_GIRSOURCES += AvahiCore-0.6.gir
 endif BUILD_AVAHI
 
 if BUILD_BABL
@@ -952,6 +952,8 @@
 clean-gir:
 	@rm -fr $(BUILT_GIRSOURCES)
 
+vpath %.gir $(srcdir):$(builddir)
+
 %.xpath: %.gir
 
 %.xpath.test: %.xpath
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]