diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 22:31:35 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 22:31:35 +0000 |
| commit | de56f378336660dcc848763c80267a5e063ae47d (patch) | |
| tree | 7f551b88923b35bc4022ce6ab3a3f602fb60d91c /webkit/pending/DerivedSources.make | |
| parent | dc4f63c80cb90efe594131030aad6776e5945fcc (diff) | |
| download | chromium_src-de56f378336660dcc848763c80267a5e063ae47d.zip chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.gz chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.bz2 | |
Merge the chrome_webkit_merge_branch back on to trunk. This brings us
up to webkit@36102.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/pending/DerivedSources.make')
| -rw-r--r-- | webkit/pending/DerivedSources.make | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/webkit/pending/DerivedSources.make b/webkit/pending/DerivedSources.make index 00a65ff..b4ce4bc 100644 --- a/webkit/pending/DerivedSources.make +++ b/webkit/pending/DerivedSources.make @@ -46,7 +46,8 @@ all : \ CharsetData.cpp endif -# we don't want to generate objC bindings \ +# We don't want to generate objC bindings. Comment out everything in +# this block \ DOMAbstractView.h \ DOMAttr.h \ DOMCDATASection.h \ @@ -615,14 +616,14 @@ ifeq ($(findstring ENABLE_SVG,$(FEATURE_DEFINES)), ENABLE_SVG) CSSPropertyNames.h : css/CSSPropertyNames.in css/SVGCSSPropertyNames.in if sort $< $(WebCore)/css/SVGCSSPropertyNames.in | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi cat $< $(WebCore)/css/SVGCSSPropertyNames.in > CSSPropertyNames.in - perl "$(WebCore)/../../../webkit/pending/makeprop.pl" + perl "$(WebCore)/css/makeprop.pl" CSSValueKeywords.h : css/CSSValueKeywords.in css/SVGCSSValueKeywords.in # Lower case all the values, as CSS values are case-insensitive perl -ne 'print lc' $(WebCore)/css/SVGCSSValueKeywords.in > SVGCSSValueKeywords.in if sort $< SVGCSSValueKeywords.in | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi cat $< SVGCSSValueKeywords.in > CSSValueKeywords.in - perl "$(WebCore)/../../../webkit/pending/makevalues.pl" + perl "$(WebCore)/css/makevalues.pl" else |