(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).

2 files changed, 38 insertions, 0 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 12f9c5b8433..de148f9fe7f 100644
--- 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 1d9ada44b4a..1fc71e8685f 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -143,15 +143,43 @@ maybe-bootstrap-SH: doit
 bootstrap:      addsection cmdproxy bootstrap-$(MAKETYPE)

         $(MAKE) $(MFLAGS) $(XMFLAGS) all

 

+unidatagen-nmake:

+        cd ..\admin\unidata

+        $(MAKE) $(MFLAGS)

+        cd ..\..\nt

+

+unidatagen-clean-nmake:

+        cd ..\admin\unidata

+        $(MAKE) $(MFLAGS) clean

+        cd ..\..\nt

+

+unidatagen-CMD:

+        if exist ..\admin\unidata\UnicodeData.txt \

+           $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../admin/unidata

+

+unidatagen-clean-CMD:

+        if exist ..\admin\unidata\UnicodeData.txt \

+           $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../admin/unidata clean

+

+unidatagen-SH:

+        test -f ../admin/unidata/UnicodeData.txt && \

+           $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../admin/unidata

+

+unidatagen-clean-SH:

+        test -f ../admin/unidata/UnicodeData.txt && \

+           $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../admin/unidata clean

+

 bootstrap-nmake: addsection cmdproxy

         cd ..\lisp

         $(MAKE) $(MFLAGS) bootstrap-clean

         cd ..\src

         $(MAKE) $(MFLAGS) clean

+        if exist ..\admin $(MAKE) unidatagen-clean-nmake

         cd ..\lib-src

         $(MAKE) $(MFLAGS) clean

         cd ..\src

         $(MAKE) $(MFLAGS) bootstrap

+        if exist ..\admin $(MAKE) unidatagen-nmake

         $(MAKE) $(MFLAGS) bootstrap-clean

         cd ..\nt

         $(CP) $(BLD)/cmdproxy.exe ../bin

@@ -164,8 +192,10 @@ bootstrap-nmake: addsection cmdproxy
 bootstrap-gmake: addsection cmdproxy

         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean

         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean

+        $(MAKE) $(MFLAGS) $(XMFLAGS) unidatagen-clean-$(SHELLTYPE)

         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean

         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap

+        $(MAKE) $(MFLAGS) $(XMFLAGS) unidatagen-$(SHELLTYPE)

         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean

         $(CP) $(BLD)/cmdproxy.exe ../bin

         $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap