Diff for /embedaddon/php/win32/build/Makefile between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:48:06 version 1.1.1.2, 2012/05/29 12:34:34
Line 22  LD="$(LINK)" Line 22  LD="$(LINK)"
 MC="$(MC)"  MC="$(MC)"
 MT="$(MT)"  MT="$(MT)"
 RE2C="$(RE2C)"  RE2C="$(RE2C)"
   PGOMGR="$(PGOMGR)"
 PHP_BUILD=$(PHP_BUILD)  PHP_BUILD=$(PHP_BUILD)
   
 MCFILE=$(BUILD_DIR)\wsyslog.rc  MCFILE=$(BUILD_DIR)\wsyslog.rc
Line 60  Zend\zend_language_scanner.c: Zend\zend_language_scann Line 61  Zend\zend_language_scanner.c: Zend\zend_language_scann
         $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l          $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l
 !endif  !endif
   
   !if $(PGOMGR) != ""
   PHP5_PGD_OPTION=/PGD:$(PGOPGD_DIR)\php5.pgd
   !else
   PHP5_PGD_OPTION=
   !endif
   
 PHPDLL_RES=$(BUILD_DIR)\$(PHPDLL).res  PHPDLL_RES=$(BUILD_DIR)\$(PHPDLL).res
   
 $(MCFILE): win32\build\wsyslog.mc  $(MCFILE): win32\build\wsyslog.mc
Line 82  $(PHPDLL_RES): win32\build\template.rc Line 89  $(PHPDLL_RES): win32\build\template.rc
                 win32\build\template.rc                  win32\build\template.rc
   
 $(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE)  $(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE)
        @$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) /link /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS)        @$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) /link /out:$(BUILD_DIR)\$(PHPDLL) $(PHP5_PGD_OPTION) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS)
         -@$(_VC_MANIFEST_EMBED_DLL)          -@$(_VC_MANIFEST_EMBED_DLL)
   
 $(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)  $(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)
Line 120  clean-all: Line 127  clean-all:
         @cd $(BUILD_DIR)          @cd $(BUILD_DIR)
         @for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @rd /s /q %D          @for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @rd /s /q %D
         @cd "$(PHP_SRC_DIR)"          @cd "$(PHP_SRC_DIR)"
        -@del /f /q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\*.rc $(BUILD_DIR)\*.dbg $(BUILD_DIR)\*.bin $(BUILD_DIR)\php*.dll $(BUILD_DIR)\php*.exe > NUL        -@del /f /q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\*.rc $(BUILD_DIR)\*.manifest $(BUILD_DIR)\*.dbg $(BUILD_DIR)\*.bin $(BUILD_DIR)\php*.dll $(BUILD_DIR)\php*.exe > NUL
 
 clean-pgo: clean-all
         -rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
         -rd /s /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)
         -rd /s /q $(BUILD_DIR)\php-test-pack-$(PHP_VERSION_STRING)
         -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
         -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
         -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
         -del /f /q $(BUILD_DIR)\php-test-pack-$(PHP_VERSION_STRING).zip
   
 test:  test:
         "$(BUILD_DIR)\php.exe" -d open_basedir= -d output_buffering=0 run-tests.php $(TESTS) -p "$(BUILD_DIR)\php.exe"          "$(BUILD_DIR)\php.exe" -d open_basedir= -d output_buffering=0 run-tests.php $(TESTS) -p "$(BUILD_DIR)\php.exe"

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>