summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2011-01-02 18:14:50 +0000
committerPierre Joye <pajoye@php.net>2011-01-02 18:14:50 +0000
commitec3003ade1b9b52714a8396357e085c2058d3a04 (patch)
tree3eda29ff7431a3396c6931af3f3c9e0270dc6cdc /win32
parent5bd1fd410febcf6168a531f92c0414e38de242a5 (diff)
downloadphp-git-ec3003ade1b9b52714a8396357e085c2058d3a04.tar.gz
- typo, and remove undesired committed part
Diffstat (limited to 'win32')
-rw-r--r--win32/build/Makefile2
-rw-r--r--win32/build/confutils.js5
2 files changed, 1 insertions, 6 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile
index 171d81df58..5ccb2a95ad 100644
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -182,7 +182,7 @@ build-devel: build-headers build-lib
@copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y >nul
@copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y >nul
@copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y >nul
- copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y >nul
+ @copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y >nul
install-sdk: build-devel
@xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 6ae5e881c0..ed5c8a5aa0 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -1129,11 +1129,6 @@ function ADD_EXTENSION_DEP(extname, dependson, optional)
var dep_present = false;
var dep_shared = false;
- if (MODE_PHPIZE) {
- ext_deps_js = file_get_contents(PHP_DIR + "\\ext_deps.js");
- eval(ext_deps_js);
- }
-
try {
dep_present = eval("PHP_" + DEP);