GNOME.org
 

[gir-repository] Do not always depend on Atk, Pango and Gtk girs

commit 76d7bf76e32d4725fc233f3be6a60cc145637445
Author: Johan Dahlin <johan gnome org>
Date:   Thu Dec 31 15:10:09 2009 +0100

    Do not always depend on Atk, Pango and Gtk girs
    
    They can be built upstream now, take that into account
    when setting up the gir dependencies

 gir/Makefile.am |   59 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 47 insertions(+), 12 deletions(-)
---
diff --git a/gir/Makefile.am b/gir/Makefile.am
index 2389927..b82ee5b 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -6,7 +6,21 @@ CUSTOM_GIRSOURCES =
 XPATH_TESTS =
 COMMON_CUSTOM_LDFLAGS= -avoid-version -rdynamic
 
+POPPLER_GIR_DEPS =
+GDK_GIR_DEPS =
+GTK_GIR_DEPS =
+WEBKIT_GIR_DEPS =
+NOTIFY_GIR_DEPS =
+GTKSOURCE_GIR_DEPS =
+VTE_GIR_DEPS =
+GOOCANVAS_GIR_DEPS =
+UNIQUE_GIR_DEPS =
+NAUTILUS_GIR_DEPS =
+WNCK_GIR_DEPS =
+GMENU_GIR_DEPS =
+
 AVAHI_GIRSOURCES = AvahiCore-0.6.gir
+
 if BUILD_AVAHI
 CUSTOM_GIRSOURCES += $(AVAHI_GIRSOURCES)
 endif
@@ -175,13 +189,17 @@ PangoX-1.0.gir: Pango-1.0.gir $(INTROSPECTION_SCANNER)
             --pkg pangox \
             $(PANGO_INCLUDEDIR)/pango/pangox.h
 BUILT_GIRSOURCES += PangoX-1.0.gir
+
+POPPLER_GIR_DEPS += Pango-1.0.gir
+GDK_GIR_DEPS += Pango-1.0.gir
+GTK_GIR_DEPS += Pango-1.0.gir
 endif
 endif
 
 #poppler
 if BUILD_POPPLER
 POPPLER_INCLUDEDIR=`pkg-config --variable=includedir poppler-glib`/poppler
-Poppler-0.8.gir: Gdk-2.0.gir Pango-1.0.gir $(INTROSPECTION_SCANNER)
+Poppler-0.8.gir: $(POPPLER_GIR_DEPS)
 	$(INTROSPECTION_SCANNER) -v --namespace Poppler --nsversion=0.8 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=GObject-2.0 \
@@ -229,6 +247,7 @@ Atk-1.0.gir: $(INTROSPECTION_SCANNER)
              -I$(ATK_INCLUDEDIR) \
              $(ATK_INCLUDEDIR)/atk/*.h
 BUILT_GIRSOURCES += Atk-1.0.gir
+GTK_GIR_DEPS += Atk-1.0.gir
 endif
 
 # Gtk
@@ -265,9 +284,12 @@ GdkPixbuf-2.0.gir: $(INTROSPECTION_SCANNER) GdkPixbuf-custom.c
 BUILT_GIRSOURCES += GdkPixbuf-2.0.gir
 XPATH_TESTS += GdkPixbuf-2.0.xpath
 
+GDK_GIR_DEPS += GdkPixbuf-2.0.gir libgirepo-Gdk-custom.la
+POPPLER_GIR_DEPS += Gdk-2.0.gir
+
 lib_LTLIBRARIES += libgirepo-Gdk-custom.la
 GDK_INCLUDEDIR=`pkg-config --variable=includedir gdk-$(GDK_TARGET)-2.0`/gtk-2.0
-Gdk-2.0.gir: Pango-1.0.gir GdkPixbuf-2.0.gir libgirepo-Gdk-custom.la $(INTROSPECTION_SCANNER)
+Gdk-2.0.gir: $(GDK_GIR_DEPS)
 	$(INTROSPECTION_SCANNER) -v --namespace Gdk --nsversion=2.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gio-2.0 \
@@ -290,9 +312,20 @@ Gdk-2.0.gir: Pango-1.0.gir GdkPixbuf-2.0.gir libgirepo-Gdk-custom.la $(INTROSPEC
              $(GDK_INCLUDEDIR)/gdk/*.h
 BUILT_GIRSOURCES += Gdk-2.0.gir
 
+GTK_GIR_DEPS += GdkPixbuf-2.0.gir Gdk-2.0.gir libgirepo-Gtk-custom.la
+WEBKIT_GIR_DEPS += Gtk-2.0.gir
+NOTIFY_GIR_DEPS += Gtk-2.0.gir
+GTKSOURCE_GIR_DEPS += Gtk-2.0.gir
+VTE_GIR_DEPS += Gtk-2.0.gir
+GOOCANVAS_GIR_DEPS += Gtk-2.0.gir
+UNIQUE_GIR_DEPS += Gtk-2.0.gir
+NAUTILUS_GIR_DEPS += Gtk-2.0.gir
+WNCK_GIR_DEPS += Gtk-2.0.gir
+GMENU_GIR_DEPS += Gtk-2.0.gir
+
 lib_LTLIBRARIES += libgirepo-Gtk-custom.la
 GTK_INCLUDEDIR=`pkg-config --variable=includedir gtk+-$(GDK_TARGET)-2.0`/gtk-2.0
-Gtk-2.0.gir: Pango-1.0.gir Atk-1.0.gir GdkPixbuf-2.0.gir Gdk-2.0.gir libgirepo-Gtk-custom.la $(INTROSPECTION_SCANNER)
+Gtk-2.0.gir: $(GTK_GIR_DEPS)
 	$(INTROSPECTION_SCANNER) -v --namespace Gtk --nsversion=2.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gio-2.0 \
@@ -333,8 +366,9 @@ EXTRA_DIST += $(libgirepo_Gtk_custom_la_SOURCES)
 # webkit
 JSCORE_GIRSOURCES = JSCore-1.0.gir
 if BUILD_WEBKIT
+WEBKIT_GIR_DEPS += $(JSCORE_GIRSOURCES) Soup-2.4.gir $(INTROSPECTION_SCANNER)
 WEBKIT_INCLUDEDIR=`pkg-config --variable=includedir webkit-1.0`
-WebKit-1.0.gir: $(JSCORE_GIRSOURCES) Gtk-2.0.gir Soup-2.4.gir $(INTROSPECTION_SCANNER)
+WebKit-1.0.gir: $(WEBKIT_GIR_DEPS)
 	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace WebKit --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=GObject-2.0 \
@@ -358,8 +392,9 @@ EXTRA_DIST += WebKit-1.0.xpath
 # libnotify
 EXTRA_DIST += $(srcdir)/Notify-custom.c
 if BUILD_NOTIFY
+NOTIFY_GIR_DEPS += $(INTROSPECTION_SCANNER) Notify-custom.c
 NOTIFY_INCLUDEDIR=`pkg-config --variable=includedir libnotify`
-Notify-0.4.gir: $(INTROSPECTION_SCANNER) Gtk-2.0.gir Notify-custom.c
+Notify-0.4.gir: $(NOTIFY_GIR_DEPS)
 	$(INTROSPECTION_SCANNER) -v --namespace Notify --nsversion=0.4 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gtk-2.0 \
@@ -378,7 +413,7 @@ endif
 # gtksourceview
 if BUILD_GTKSOURCEVIEW
 GTKSOURCEVIEW_INCLUDEDIR=`pkg-config --variable=includedir gtksourceview-2.0`/gtksourceview-2.0
-GtkSource-2.2.gir: $(INTROSPECTION_SCANNER) Gtk-2.0.gir
+GtkSource-2.2.gir: $(GTKSOURCE_GIR_DEPS)
 	$(INTROSPECTION_SCANNER) -v --namespace GtkSource --strip-prefix=Gtk --nsversion=2.2 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gtk-2.0 \
@@ -394,7 +429,7 @@ endif
 # vte
 if BUILD_VTE
 VTE_INCLUDEDIR=`pkg-config --variable=includedir vte`
-Vte-1.0.gir: $(INTROSPECTION_SCANNER) Gtk-2.0.gir
+Vte-1.0.gir: $(VTE_GIR_DEPS)
 	$(INTROSPECTION_SCANNER) -v --namespace Vte --nsversion=1.0 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gtk-2.0 \
@@ -409,7 +444,7 @@ endif
 
 if BUILD_GOOCANVAS
 GOOCANVAS_INCLUDEDIR=`pkg-config --variable=includedir goocanvas`
-GooCanvas-0.10.gir: Gtk-2.0.gir $(INTROSPECTION_SCANNER)
+GooCanvas-0.10.gir: $(GOOCANVAS_GIR_DEPS)
 	$(INTROSPECTION_SCANNER) -v --namespace GooCanvas --nsversion=0.10 \
 	    --add-include-path=$(srcdir) --add-include-path=. \
 	     --strip-prefix=Goo \
@@ -823,7 +858,7 @@ endif BUILD_BABL
 
 if BUILD_UNIQUE
 UNIQUE_INCLUDEDIR=`pkg-config --variable=includedir unique-1.0`/unique-1.0/unique
-Unique-1.0.gir: Gtk-2.0.gir $(INTROSPECTION_SCANNER)
+Unique-1.0.gir: $(UNIQUE_GIR_DEPS)
 	$(INTROSPECTION_SCANNER) -v --namespace Unique --nsversion=1.0 \
 	     --add-include-path=$(srcdir) --add-include-path=. \
              --include=Gtk-2.0 \
@@ -837,7 +872,7 @@ endif BUILD_UNIQUE
 
 if BUILD_NAUTILUS
 NAUTILUS_INCLUDEDIR=`pkg-config --variable=includedir libnautilus-extension`/nautilus/libnautilus-extension
-Nautilus-1.0.gir: Gtk-2.0.gir $(INTROSPECTION_SCANNER)
+Nautilus-1.0.gir: $(NAUTILUS_GIR_DEPS)
 	$(INTROSPECTION_SCANNER) -v --namespace Nautilus --nsversion=1.0 \
             --add-include-path=$(srcdir) --add-include-path=\
             --include=Gtk-2.0 \
@@ -852,7 +887,7 @@ endif
 
 if BUILD_WNCK
 WNCK_INCLUDEDIR=`pkg-config --variable=includedir libwnck-1.0`/libwnck-1.0/libwnck
-Wnck-1.0.gir: Gtk-2.0.gir $(INTROSPECTION_SCANNER)
+Wnck-1.0.gir: $(WNCK_GIR_DEPS)
 	$(INTROSPECTION_SCANNER) -v --namespace Wnck --nsversion=1.0 \
             --add-include-path=$(srcdir) --add-include-path=. \
             --include=Gtk-2.0 \
@@ -867,7 +902,7 @@ endif
 
 if BUILD_GMENU
 GMENU_INCLUDEDIR=`pkg-config --variable=includedir libgnome-menu`/gnome-menus
-GMenu-2.0.gir: Gtk-2.0.gir $(INTROSPECTION_SCANNER)
+GMenu-2.0.gir: $(GMENU_GIR_DEPS)
 	$(INTROSPECTION_SCANNER) -v --namespace GMenu --nsversion=2.0 \
             --add-include-path=$(srcdir) --add-include-path=. \
             --include=Gtk-2.0 \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]