summaryrefslogtreecommitdiffstats
path: root/webkit/build/KJSBindings
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 22:25:22 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-09 22:25:22 +0000
commit8b45aa1d0433769f27038c2f3304a08636e4e233 (patch)
tree796fe2dee03577967e9ffe39284ab2e74df433d9 /webkit/build/KJSBindings
parentb6b84b5e7621f720c68dde6d59e120a8fc026315 (diff)
downloadchromium_src-8b45aa1d0433769f27038c2f3304a08636e4e233.zip
chromium_src-8b45aa1d0433769f27038c2f3304a08636e4e233.tar.gz
chromium_src-8b45aa1d0433769f27038c2f3304a08636e4e233.tar.bz2
Unfork DerivedSources.make, part 2.
Review URL: http://codereview.chromium.org/7033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/KJSBindings')
-rw-r--r--webkit/build/KJSBindings/KJSBindings_prebuild.vcproj4
-rwxr-xr-xwebkit/build/KJSBindings/build-generated-files.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/build/KJSBindings/KJSBindings_prebuild.vcproj b/webkit/build/KJSBindings/KJSBindings_prebuild.vcproj
index a45cf2c..8a40305 100644
--- a/webkit/build/KJSBindings/KJSBindings_prebuild.vcproj
+++ b/webkit/build/KJSBindings/KJSBindings_prebuild.vcproj
@@ -25,7 +25,7 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="prebuild.bat $(OutDir) $(OutDir)\obj\KJSBindings"
- AdditionalDependencies="$(ProjectDir)\build-generated-files.sh;..\..\pending\DerivedSources.make"
+ AdditionalDependencies="$(ProjectDir)\build-generated-files.sh;..\..\..\third_party\WebKit\WebCore\DerivedSources.make"
Outputs="$(OutDir)\obj\KJSBindings\DerivedSources\HTMLNames.cpp"
/>
<Tool
@@ -88,7 +88,7 @@
<Tool
Name="VCCustomBuildTool"
CommandLine="prebuild.bat $(OutDir) $(OutDir)\obj\KJSBindings"
- AdditionalDependencies="$(ProjectDir)\build-generated-files.sh;..\..\pending\DerivedSources.make"
+ AdditionalDependencies="$(ProjectDir)\build-generated-files.sh;..\..\third_party\WebKit\WebCore\DerivedSources.make"
Outputs="$(OutDir)\obj\KJSBindings\DerivedSources\HTMLNames.cpp"
/>
<Tool
diff --git a/webkit/build/KJSBindings/build-generated-files.sh b/webkit/build/KJSBindings/build-generated-files.sh
index f1872e7..de7c05a 100755
--- a/webkit/build/KJSBindings/build-generated-files.sh
+++ b/webkit/build/KJSBindings/build-generated-files.sh
@@ -37,4 +37,4 @@ export ENCODINGS_PREFIX=""
# webkit/third_party/WebCore/Configurations/WebCore.xcconfig
export FEATURE_DEFINES="ENABLE_SVG ENABLE_SVG_ANIMATION ENABLE_SVG_AS_IMAGE ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_USE ENABLE_XPATH ENABLE_XSLT"
-make -f "$WebCore/../../../webkit/pending/DerivedSources.make" -j 2 || exit 1
+make -f "$WebCore/DerivedSources.make" -j 2 || exit 1