cvs: php-src /win32/build Makefile

wez Sun Aug 1 07:19:34 2004 EDT Modified files: /php-src/win32/build Makefile Log: Juggle deps http://cvs.php.net/diff.php/php-src/win32/build/Makefile?r1=1.24&r2=1.25&ty=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.24 php-src/win32/build/Makefile:1.25 --- php-src/win32/build/Makefile:1.24 Sat Jul 31 19:59:46 2004 +++ php-src/win32/build/Makefile Sun Aug 1 07:19:33 2004 @@ -14,20 +14,22 @@ # | Author: Wez Furlong <wez@thebrainroom.com> | # +----------------------------------------------------------------------+ # -# $Id: Makefile,v 1.24 2004/07/31 23:59:46 wez Exp $ +# $Id: Makefile,v 1.25 2004/08/01 11:19:33 wez Exp $ # This is the makefile template for the win32 build CC="$(CL)" LD="$(LINK)" MC="$(MC)" -all: $(BUILD_DIR) $(BUILD_DIRS_SUB) generated_files $(EXT_TARGETS) $(PECL_TARGETS) $(SAPI_TARGETS) +MCFILE=$(BUILD_DIR)\wsyslog.res + +all: generated_files $(EXT_TARGETS) $(PECL_TARGETS) $(SAPI_TARGETS) -generated_files: Zend\zend_ini_parser.c \ +generated_files: $(BUILD_DIR) $(BUILD_DIRS_SUB) Zend\zend_ini_parser.c \ Zend\zend_language_parser.c Zend\zend_ini_scanner.c \ Zend\zend_language_scanner.c \ ext\standard\parsedate.c \ - $(PHPDEF) + $(PHPDEF) $(MCFILE) $(BUILD_DIR)\$(PHPDLL).def: $(PHP_DLL_DEF_SOURCES) type $(PHP_DLL_DEF_SOURCES) > $(BUILD_DIR)\$(PHPDLL).def @@ -49,8 +51,6 @@ PHPDLL_RES=$(BUILD_DIR)\$(PHPDLL).res -MCFILE=$(BUILD_DIR)\wsyslog.res - $(MCFILE): win32\build\wsyslog.mc $(MC) -h win32\ -r $(BUILD_DIR)\ -x $(BUILD_DIR)\ win32\build\wsyslog.mc $(RC) /fo $(MCFILE) $(BUILD_DIR)\wsyslog.rc @@ -93,7 +93,7 @@ $(BUILD_DIR)\php.exe -d open_basedir= -d safe_mode=0 -d output_buffering=0 run-tests.php $(TESTS) <<NOKEEP -build-snap: +build-snap: generated_files @$(MAKE) "$(BUILD_DIR)\$(PHPDLL)" -for %T in ($(SAPI_TARGETS)) do $(MAKE) /I /nologo "%T" -for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T"