[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ossy at webkit.org
ossy at webkit.org
Wed Dec 22 13:57:49 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b277dfc05e10dd47353a2a7418e5e0292dbdb899
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 30 15:45:41 2010 +0000
2010-09-30 Csaba Osztrogonác <ossy at webkit.org>
Reviewed by Martin Robinson.
[Gtk] build still broken since r68521
https://bugs.webkit.org/show_bug.cgi?id=46795
makevalues.pl and makeprop.pl generate 3 files in one run.
Double or triple target is incorrect, because on a multicore
machine make processes targets in parallel.
Setting a->b->c dependencies for 3 generated files guarantees
that make doesn't execute the recipe of the rule more than one.
* GNUmakefile.am: Dependencies and missing headers added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68787 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d497a23..3e0b259 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-30 Csaba Osztrogonác <ossy at webkit.org>
+
+ Reviewed by Martin Robinson.
+
+ [Gtk] build still broken since r68521
+ https://bugs.webkit.org/show_bug.cgi?id=46795
+
+ makevalues.pl and makeprop.pl generate 3 files in one run.
+ Double or triple target is incorrect, because on a multicore
+ machine make processes targets in parallel.
+
+ Setting a->b->c dependencies for 3 generated files guarantees
+ that make doesn't execute the recipe of the rule more than one.
+
+ * GNUmakefile.am: Dependencies and missing headers added.
+
2010-09-30 Andrey Kosyakov <caseq at chromium.org>
Unreviewed build fix (marked ResourceRawHeaders.h as private)
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index afa6851..6bea52f 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -88,8 +88,10 @@ webcore_built_sources += \
DerivedSources/WebCore/CSSGrammar.h \
DerivedSources/WebCore/CSSPropertyNames.h \
DerivedSources/WebCore/CSSPropertyNames.cpp \
+ DerivedSources/WebCore/CSSPropertyNamesHash.h \
DerivedSources/WebCore/CSSValueKeywords.h \
DerivedSources/WebCore/CSSValueKeywords.cpp \
+ DerivedSources/WebCore/CSSValueKeywordsHash.h \
DerivedSources/WebCore/ColorData.cpp \
DerivedSources/WebCore/DocTypeStrings.cpp \
DerivedSources/WebCore/HashTools.h \
@@ -4398,7 +4400,8 @@ FEATURE_DEFINES += ENABLE_BLOB=1
webcore_cppflags += -DENABLE_BLOB=1
endif # END ENABLE_BLOB
-DerivedSources/WebCore/CSSPropertyNames.cpp:
+DerivedSources/WebCore/CSSPropertyNamesHash.h: DerivedSources/WebCore/CSSPropertyNames.cpp
+DerivedSources/WebCore/CSSPropertyNames.cpp: DerivedSources/WebCore/CSSPropertyNames.h
DerivedSources/WebCore/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/makeprop.pl
if sort $(WEBCORE_CSS_PROPERTY_NAMES) | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
cat $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
@@ -4406,7 +4409,8 @@ DerivedSources/WebCore/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCo
mv CSSPropertyNames.* $(GENSOURCES_WEBCORE)
# Lower case all the values, as CSS values are case-insensitive
-DerivedSources/WebCore/CSSValueKeywords.cpp:
+DerivedSources/WebCore/CSSValueKeywordsHash.h: DerivedSources/WebCore/CSSValueKeywords.cpp
+DerivedSources/WebCore/CSSValueKeywords.cpp: DerivedSources/WebCore/CSSValueKeywords.h
DerivedSources/WebCore/CSSValueKeywords.h: $(WEBCORE_CSS_VALUE_KEYWORDS) $(WebCore)/css/makevalues.pl
$(PERL) -ne 'print lc' $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in
if sort CSSValueKeywords.in | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list