Merge from emacs-23

[gnu-emacs] / admin / unidata / makefile.w32-in

diff --git a/admin/unidata/makefile.w32-in b/admin/unidata/makefile.w32-in
index 71d2f8a153a4f8ec0fa850e8b749e9ad5005d628..1f9f276a35cdb54212fed5209f963ea582c9c146 100644 (file)
--- a/admin/unidata/makefile.w32-in
+++ b/admin/unidata/makefile.w32-in
@@ -27,9 +27,9 @@ lisp = $(CURDIR)/../../lisp
 # lisp/subdirs.el is not generated yet when the commands below run.
 EMACSLOADPATH = $(lisp);$(lisp)/international;$(lisp)/emacs-lisp
 # Quote EMACS so it could be a file name with embedded whitespace
-RUNEMACS = "$(EMACS)" -Q --multibyte -batch
+RUNEMACS = "$(EMACS)" -Q -batch
 
-all: $(DSTDIR)/charprop.el
+all: $(DSTDIR)/charprop.el ../../src/biditype.h ../../src/bidimirror.h
 
 .el.elc:
        $(RUNEMACS) -f batch-byte-compile $<
@@ -50,6 +50,16 @@ charprop-CMD: unidata-gen.elc unidata.txt
 
 ${DSTDIR}/charprop.el: charprop-$(SHELLTYPE)
 
+../../src/biditype.h: UnicodeData.txt
+       gawk -F";" -f biditype.awk -v BINMODE=2 $< > biditype.h
+       $(CP) biditype.h $@
+       $(DEL) biditype.h
+
+../../src/bidimirror.h: BidiMirroring.txt
+       gawk -F"[; ]+" -f bidimirror.awk -v BINMODE=2 $< > bidimirror.h
+       $(CP) bidimirror.h $@
+       $(DEL) bidimirror.h
+
 clean:
-       - $(DEL) unidata-gen.elc unidata.txt
+       - $(DEL) unidata-gen.elc unidata.txt biditype.h bidimirror.h