(unidatagen-nmake, unidatagen-clean-nmake, unidatagen-CMD)

(unidatagen-clean-CMD, unidatagen-SH, unidatagen-clean-SH): New targets.
(bootstrap-nmake): Invoke unidatagen-nmake.
(bootstrap-gmake): Invoke unidatagen-$(SHELLTYPE).

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 12f9c5b..de148f9 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-02  Eli Zaretskii  <eliz@gnu.org>
+
+       * makefile.w32-in (unidatagen-nmake, unidatagen-clean-nmake)
+       (unidatagen-CMD, unidatagen-clean-CMD, unidatagen-SH)
+       (unidatagen-clean-SH): New targets.
+       (bootstrap-nmake): Invoke unidatagen-nmake.
+       (bootstrap-gmake): Invoke unidatagen-$(SHELLTYPE).
+
 2008-02-02  Jason Rumney  <jasonr@gnu.org>
 
        * configure.bat (withfont): Set sep1 after modifying usercflags.

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 1d9ada4..1fc71e8 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -143,15 +143,43 @@ maybe-bootstrap-SH: doit
 bootstrap:     addsection cmdproxy bootstrap-$(MAKETYPE)\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) all\r
 \r
+unidatagen-nmake:\r
+       cd ..\admin\unidata\r
+       $(MAKE) $(MFLAGS)\r
+       cd ..\..\nt\r
+\r
+unidatagen-clean-nmake:\r
+       cd ..\admin\unidata\r
+       $(MAKE) $(MFLAGS) clean\r
+       cd ..\..\nt\r
+\r
+unidatagen-CMD:\r
+       if exist ..\admin\unidata\UnicodeData.txt \\r
+          $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../admin/unidata\r
+\r
+unidatagen-clean-CMD:\r
+       if exist ..\admin\unidata\UnicodeData.txt \\r
+          $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../admin/unidata clean\r
+\r
+unidatagen-SH:\r
+       test -f ../admin/unidata/UnicodeData.txt && \\r
+          $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../admin/unidata\r
+\r
+unidatagen-clean-SH:\r
+       test -f ../admin/unidata/UnicodeData.txt && \\r
+          $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../admin/unidata clean\r
+\r
 bootstrap-nmake: addsection cmdproxy\r
        cd ..\lisp\r
        $(MAKE) $(MFLAGS) bootstrap-clean\r
        cd ..\src\r
        $(MAKE) $(MFLAGS) clean\r
+       if exist ..\admin $(MAKE) unidatagen-clean-nmake\r
        cd ..\lib-src\r
        $(MAKE) $(MFLAGS) clean\r
        cd ..\src\r
        $(MAKE) $(MFLAGS) bootstrap\r
+       if exist ..\admin $(MAKE) unidatagen-nmake\r
        $(MAKE) $(MFLAGS) bootstrap-clean\r
        cd ..\nt\r
        $(CP) $(BLD)/cmdproxy.exe ../bin\r
@@ -164,8 +192,10 @@ bootstrap-nmake: addsection cmdproxy
 bootstrap-gmake: addsection cmdproxy\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) unidatagen-clean-$(SHELLTYPE)\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap\r
+       $(MAKE) $(MFLAGS) $(XMFLAGS) unidatagen-$(SHELLTYPE)\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean\r
        $(CP) $(BLD)/cmdproxy.exe ../bin\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap\r