From: Wez Furlong <wez@php.net>
Date: Sun, 1 Aug 2004 11:19:33 +0000 (+0000)
Subject: Juggle deps
X-Git-Tag: PRE_ZEND_VM_DISPATCH_PATCH~285
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a90ba36424dcb95f9686abbb6801bbcc2b10889;p=php

Juggle deps
---

diff --git a/win32/build/Makefile b/win32/build/Makefile
index 43e5d74858..9030d1ac48 100644
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -21,13 +21,15 @@ 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 @@ ext\standard\parsedate.c ext\standard\parsedate.h: ext\standard\parsedate.y
 
 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 @@ set TEST_PHP_EXECUTABLE=$(BUILD_DIR)\php.exe
 $(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"