WinCE makefile will now hypothetically build git_version.h

The dependency on $(CONFIGPM) is for git_version.h to exist early enough
to be copied to the CORE dir. In real life, git_version.h still is built
by a Desktop build since WinCE doesn't yet support being built with a
system Perl. This commit is a step in getting WinCE to build without
needing a Desktop build first and for better integration with Castaway's
Cross changes in the future. The changes in this commit were tested with
other unpublished changes that tried to do a WinCE build with a system
Perl.

diff --git a/win32/Makefile.ce b/win32/Makefile.ce
index bd1da4c503913c9288adce15860b40a35b746f07..6a76da93d9d31f4d266e9e77a6c3eee4e817e1c5 100644 (file)
--- a/win32/Makefile.ce
+++ b/win32/Makefile.ce
@@ -787,7 +787,7 @@ $(DYNALOADER)$(o) : $(DYNALOADER).c xconfig.h $(EXTDIR)\DynaLoader\dlutils.c
 #convenience target
 configpm_targ : $(CONFIGPM)
 
-$(CONFIGPM) : $(HPERL) ..\Cross\config-$(MACHINE).sh config_h.PL
+$(CONFIGPM) : $(HPERL) ..\Cross\config-$(MACHINE).sh config_h.PL ..\git_version.h
        cd .. && $(HPERL) -Ilib configpm --cross=$(CROSS_NAME) --no-glossary
        -mkdir $(XCOREDIR)
        $(XCOPY) ..\*.h $(XCOREDIR)\*.*
@@ -804,6 +804,12 @@ $(CONFIGPM) : $(HPERL) ..\Cross\config-$(MACHINE).sh config_h.PL
        echo "#error This is a cross build. Use xconfig.h. \
 " > $(XCOREDIR)\config.h
 
+..\git_version.h : ..\make_patchnum.pl
+       cd .. && $(HPERL) -Ilib make_patchnum.pl && cd win32
+
+# make sure that we recompile perl.c if the git version changes
+$(DLLDIR)\perl.obj : ..\git_version.h
+
 ..\Cross\config-$(MACHINE).sh: config.ce config_sh.PL
        $(HPERL) -I..\lib -I. config_sh.PL $(CFG_VARS) config.ce > ..\Cross\config-$(MACHINE).sh
 
@@ -846,6 +852,7 @@ clean: Extensions_clean
         -if exist ..\xlib rmdir /s /q ..\xlib
         -if exist .\$(MACHINE) rmdir /s /q .\$(MACHINE)
   -@$(DEL) config.h xconfig.h perl.res
+       -@$(DEL) ..\git_version.h
   -@$(DEL) ..\t\test_state
 
 XDLLOBJS = \