From: kov@webkit.org Date: Sat, 5 Dec 2009 15:35:51 +0000 (+0000) Subject: 2009-12-05 Vincent Untz X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=0c42489242588dc1a6019fbcafa1350c7af02180 2009-12-05 Vincent Untz 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 36dfef396c9d..1127f04a904b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-12-05 Vincent Untz + + Reviewed by Gustavo Noronha. + + Fixes race for builds with introspection enabled, and parallel + make. + + * GNUmakefile.am: + 2009-12-04 Xan Lopez Reviewed by Gustavo Noronha. diff --git a/GNUmakefile.am b/GNUmakefile.am index d387db018392..d8fa6ac7e118 100644 --- 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)/ -$(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 \