[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[philn at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 81834ba98af83dedf09a081c3230d999852dcec1
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 15:11:14 2010 +0000

    2010-09-29  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            build still broken since r68521
            https://bugs.webkit.org/show_bug.cgi?id=46795
    
            Call make-values.pl once only. It seems calling it multiple times
            in the same build produces a wrong CSSValueKeywordsHash.h which
            has a duplicate declaration of its valueList variable. The double
            call is triggered by the double targets in the Makefile rules and
            makevalues.pl generates one of them, which screws up the build. A
            more proper fix should be done with the advices on
            http://www.cmcrossroads.com/cm-basics/12905-rules-with-multiple-outputs-in-gnu-make
    
            * GNUmakefile.am:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68645 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1f0baaa..c660e9d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-09-29  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        build still broken since r68521
+        https://bugs.webkit.org/show_bug.cgi?id=46795
+
+        Call make-values.pl once only. It seems calling it multiple times
+        in the same build produces a wrong CSSValueKeywordsHash.h which
+        has a duplicate declaration of its valueList variable. The double
+        call is triggered by the double targets in the Makefile rules and
+        makevalues.pl generates one of them, which screws up the build. A
+        more proper fix should be done with the advices on
+        http://www.cmcrossroads.com/cm-basics/12905-rules-with-multiple-outputs-in-gnu-make
+
+        * GNUmakefile.am:
+
 2010-09-29  João Paulo Rechi Vita  <jprvita at profusion.mobi>
 
         Unreviewed build fix.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 985b5ce..c80e8ed 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -4395,14 +4395,16 @@ FEATURE_DEFINES += ENABLE_BLOB=1
 webcore_cppflags += -DENABLE_BLOB=1
 endif  # END ENABLE_BLOB
 
-DerivedSources/WebCore/CSSPropertyNames.h DerivedSources/WebCore/CSSPropertyNames.cpp: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/makeprop.pl
+DerivedSources/WebCore/CSSPropertyNames.cpp:
+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
 	$(PERL) "$(WebCore)/css/makeprop.pl"
 	mv CSSPropertyNames.* $(GENSOURCES_WEBCORE)
 
 # Lower case all the values, as CSS values are case-insensitive
-DerivedSources/WebCore/CSSValueKeywords.h DerivedSources/WebCore/CSSValueKeywords.cpp: $(WEBCORE_CSS_VALUE_KEYWORDS) $(WebCore)/css/makevalues.pl
+DerivedSources/WebCore/CSSValueKeywords.cpp:
+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
 	$(PERL) "$(WebCore)/css/makevalues.pl"

-- 
WebKit Debian packaging