[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
kov at webkit.org
kov at webkit.org
Tue Jan 5 23:42:53 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 32e6e98e7ba09e5b0b05be3c674e4f25277ebc50
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Dec 5 15:35:51 2009 +0000
2009-12-05 Vincent Untz <vuntz at gnome.org>
Reviewed by Gustavo Noronha.
Fixes race for builds with introspection enabled, and parallel
make.
* GNUmakefile.am:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51725 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 36dfef3..1127f04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-05 Vincent Untz <vuntz at gnome.org>
+
+ Reviewed by Gustavo Noronha.
+
+ Fixes race for builds with introspection enabled, and parallel
+ make.
+
+ * GNUmakefile.am:
+
2009-12-04 Xan Lopez <xlopez at igalia.com>
Reviewed by Gustavo Noronha.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index d387db0..d8fa6ac 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 \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list