wez Sun Feb 6 18:23:06 2005 EDT
Modified files:
/php-src/win32/build Makefile confutils.js
Log:
even less noise
http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.28&r2=1.29&ty=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.28 php-src/win32/build/Makefile:1.29
--- php-src/win32/build/Makefile:1.28 Fri Jan 21 22:36:38 2005
+++ php-src/win32/build/Makefile Sun Feb 6 18:23:05 2005
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: Makefile,v 1.28 2005/01/22 03:36:38 edink Exp $
+# $Id: Makefile,v 1.29 2005/02/06 23:23:05 wez Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -65,7 +65,7 @@
win32\build\template.rc
$(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS)
$(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE)
- $(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS)
$(STATIC_EXT_LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS)
$(LIBS) $(PHPDLL_RES)
+ @$(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS)
$(STATIC_EXT_LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS)
$(LIBS) $(PHPDLL_RES)
$(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)
http://cvs.php.net/diff.php/php-src/win32/build/confutils.js?r1=1.52&r2=1.53&ty=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.52
php-src/win32/build/confutils.js:1.53
--- php-src/win32/build/confutils.js:1.52 Sun Feb 6 17:48:35 2005
+++ php-src/win32/build/confutils.js Sun Feb 6 18:23:05 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.52 2005/02/06 22:48:35 wez Exp $
+// $Id: confutils.js,v 1.53 2005/02/06 23:23:05 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -870,7 +870,7 @@
var SAPI = sapiname.toUpperCase();
var ldflags;
var resname;
- var ld = "$(LD)";
+ var ld = "@$(LD)";
STDOUT.WriteLine("Enabling SAPI " + configure_module_dirname);
@@ -1010,7 +1010,7 @@
var libname = dllname.substring(0, dllname.length-4) + ".lib";
var resname = generate_version_info_resource(dllname,
configure_module_dirname);
- var ld = "$(LD)";
+ var ld = "@$(LD)";
MFO.WriteLine("$(BUILD_DIR)\\" + dllname + " $(BUILD_DIR)\\" +
libname + ": $(DEPS_" + EXT + ") $(" + EXT + "_GLOBAL_OBJS)
$(BUILD_DIR)\\$(PHPLIB) $(BUILD_DIR)\\" + resname);
MFO.WriteLine("\t" + ld + " /out:$(BUILD_DIR)\\" + dllname + "
$(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_" + EXT + ") $(" + EXT + "_GLOBAL_OBJS)
$(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + EXT + ") $(LIBS) $(BUILD_DIR)\\" + resname);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
