]> granicus.if.org Git - php/commitdiff
- typo, and remove undesired committed part
authorPierre Joye <pajoye@php.net>
Sun, 2 Jan 2011 18:14:50 +0000 (18:14 +0000)
committerPierre Joye <pajoye@php.net>
Sun, 2 Jan 2011 18:14:50 +0000 (18:14 +0000)
win32/build/Makefile
win32/build/confutils.js

index 171d81df587f8909874fa2b49587f566122d016f..5ccb2a95ad4b188766cc3bedcd7e0721125ae60b 100644 (file)
@@ -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
index 6ae5e881c014005f583ba9f45a9299eec8138e1d..ed5c8a5aa06b99ec408d325978f1a5508b78def0 100644 (file)
@@ -1129,11 +1129,6 @@ function ADD_EXTENSION_DEP(extname, dependson, optional)
        var dep_present = false;\r
        var dep_shared = false;\r
 \r
-       if (MODE_PHPIZE) {\r
-               ext_deps_js = file_get_contents(PHP_DIR + "\\ext_deps.js");\r
-               eval(ext_deps_js);\r
-       }\r
-\r
        try {\r
                dep_present = eval("PHP_" + DEP);\r
 \r