2009-12-05 Vincent Untz <vuntz@gnome.org>

        Reviewed by Gustavo Noronha.

        Fixes race for builds with introspection enabled, and parallel
        make.

        * GNUmakefile.am:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@51725 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 36dfef396c9d4edc16a220a1c0c4e4c4bb7ad2c4..1127f04a904ba55f2c67119bb7daf458a5c7951a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-05  Vincent Untz <vuntz@gnome.org>
+
+        Reviewed by Gustavo Noronha.
+
+        Fixes race for builds with introspection enabled, and parallel
+        make.
+
+        * GNUmakefile.am:
+

 2009-12-04  Xan Lopez  <xlopez@igalia.com>
 
         Reviewed by Gustavo Noronha.
 2009-12-04  Xan Lopez  <xlopez@igalia.com>
 
         Reviewed by Gustavo Noronha.

diff --git a/GNUmakefile.am b/GNUmakefile.am
index d387db0183924399db49e19cfc304399443d45a3..d8fa6ac7e118b0dc43621d1c403baaeb56772bce 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -432,7 +432,7 @@ WEBKIT_GIRSOURCES += WebKit-1.0.gir
 JSCore-1.0.gir: $(srcdir)/WebKit/gtk/JSCore-1.0.gir
        cp $(srcdir)/WebKit/gtk/JSCore-1.0.gir $(builddir)/
 
 JSCore-1.0.gir: $(srcdir)/WebKit/gtk/JSCore-1.0.gir
        cp $(srcdir)/WebKit/gtk/JSCore-1.0.gir $(builddir)/
 

-$(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER)
+$(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER) libwebkit-1.0.la

        $(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=1.0 \
             --include=GObject-2.0 \
             --include=Gtk-2.0 \
        $(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=1.0 \
             --include=GObject-2.0 \
             --include=Gtk-2.0 \