diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-13 19:53:59 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-13 19:53:59 +0000 |
| commit | dbb8211ed7a2a52da822cd5304096cea366c1fb6 (patch) | |
| tree | 28990f872adfd0424c41e1619cef1d3746c113ca /webkit/port/DerivedSources.make | |
| parent | 460ab5535d2eceb044240c3af4e8721b792c76d6 (diff) | |
| download | chromium_src-dbb8211ed7a2a52da822cd5304096cea366c1fb6.zip chromium_src-dbb8211ed7a2a52da822cd5304096cea366c1fb6.tar.gz chromium_src-dbb8211ed7a2a52da822cd5304096cea366c1fb6.tar.bz2 | |
Update DerivedSources.make to match modified WebKit scripts. This allows us to unfork HTMLAttributeNames.in, since the upstream patch I pulled into our third_party directory supersedes the change we made locally.
This also reverts my earlier change to the include order in webkit_common.vsprops, which should now no longer be necessary.
Review URL: http://codereview.chromium.org/7116
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port/DerivedSources.make')
| -rw-r--r-- | webkit/port/DerivedSources.make | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/port/DerivedSources.make b/webkit/port/DerivedSources.make index 24f4c77..f9622e7 100644 --- a/webkit/port/DerivedSources.make +++ b/webkit/port/DerivedSources.make @@ -1031,12 +1031,12 @@ endif ifdef HTML_FLAGS HTMLNames.cpp : dom/make_names.pl html/HTMLTagNames.in html/HTMLAttributeNames.in - perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(PORTROOT)/../pending/HTMLAttributeNames.in --extraDefines "$(HTML_FLAGS)" + perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --wrapperFactory --extraDefines "$(HTML_FLAGS)" else HTMLNames.cpp : dom/make_names.pl html/HTMLTagNames.in html/HTMLAttributeNames.in - perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(PORTROOT)/../pending/HTMLAttributeNames.in + perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --wrapperFactory endif @@ -1081,11 +1081,11 @@ endif ifdef SVG_FLAGS SVGElementFactory.cpp SVGNames.cpp : dom/make_names.pl svg/svgtags.in svg/svgattrs.in - perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)" + perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory else SVGElementFactory.cpp SVGNames.cpp : dom/make_names.pl svg/svgtags.in svg/svgattrs.in - perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in + perl -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --factory --wrapperFactory endif |