* lread.c (read_vector): Use STRING_SET_CHARS.

[gnu-emacs] / leim / makefile.w32-in

diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index e7ea3aa613bf399f9b3981fa39446040f3d9c21e..4b1bae6105ca6bea4791493640f3560f1d84427f 100644 (file)
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -36,13 +36,15 @@ buildlisppath=$(CURDIR)/$(dot)$(dot)/lisp
 # How to run Emacs.
 RUN_EMACS = "$(BUILT_EMACS)" -batch --no-init-file --no-site-file --multibyte
 
+# Set EMACSLOADPATH correctly (already defined in environment).
+EMACSLOADPATH=$(buildlisppath)
+
 # Subdirectories to be made if $(srcdir) is different from the current
 # directory.
 SUBDIRS=quail
 
 # Files generated from TIT dictionaries for Chinese GB character set.
 TIT_GB=\
-       quail/CTLau.elc         \
        quail/CCDOSPY.elc       \
        quail/Punct.elc         \
        quail/QJ.elc            \
@@ -53,7 +55,6 @@ TIT_GB=\
 TIT_BIG5=\
        quail/4Corner.elc       \
        quail/ARRAY30.elc       \
-       quail/CTLauB.elc        \
        quail/ECDICT.elc        \
        quail/ETZY.elc          \
        quail/Punct-b5.elc      \
@@ -84,11 +85,11 @@ KOREAN=     $(srcdir)/quail/hangul.elc      \
 
 THAI=$(srcdir)/quail/thai.elc
 
-VIETNAMESE=$(srcdir)/quail/viqr.elc
+VIETNAMESE=$(srcdir)/quail/viqr.elc $(srcdir)/quail/vntelex.elc
 
 LAO=$(srcdir)/quail/lao.elc $(srcdir)/quail/lrt.elc
 
-INDIAN=$(srcdir)/quail/devanagari.elc
+INDIAN=$(srcdir)/quail/indian.elc
 
 TIBETAN=$(srcdir)/quail/tibetan.elc
 
@@ -116,7 +117,9 @@ MISC_DIC=\
        quail/tsang-cns.elc     \
        quail/quick-cns.elc     \
        quail/PY.elc            \
-       quail/ZIRANMA.elc
+       quail/ZIRANMA.elc       \
+       quail/CTLau.elc         \
+       quail/CTLau-b5.elc
 
 CHINESE=$(CHINESE_GB) $(CHINESE_BIG5)
 EASTASIA=$(CHINESE) $(JAPANESE) $(KOREAN)
@@ -127,6 +130,11 @@ WORLD=$(ASIA) $(EUROPEAN) $(MISC) $(MISC_DIC)
 TIT=$(CHINESE_TIT)
 NON_TIT=$(CHINESE_NON_TIT) $(JAPANESE) $(KOREAN) $(EUROPEAN) $(MISC)
 
+.SUFFIXES: .elc .el
+
+.el.elc:
+       $(RUN_EMACS) -f batch-byte-compile $<
+
 all: $(BUILT_EMACS) $(SUBDIRS) $(TIT) $(MISC_DIC) leim-list.el
 
 # To ensure that we can run Emacs.  This target is ignored (never
@@ -147,31 +155,22 @@ $(SUBDIRS):
 .NO_PARALLEL: $(TIT) $(MISC_DIC)
 
 # Rule to generate quail/*.el from CXTERM-DIC/*.tit.
-$(TIT):        $(SUBDIRS)
-       set EMACSLOADPATH=$(buildlisppath)
-       $(SETLOADPATH) $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \
+$(TIT):
+       $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \
            --eval $(ARGQUOTE)(batch-titdic-convert t)$(ARGQUOTE) \
            -dir quail $(srcdir)/CXTERM-DIC
-       $(SETLOADPATH) $(RUN_EMACS)  -l $(buildlisppath)/international/quail \
+       $(RUN_EMACS)  -l $(buildlisppath)/international/quail \
            -f batch-byte-compile $(TIT:.elc=.el)
 
 # Rule to generate quail/*.el from MISC_DIC/*.tit.
-$(MISC_DIC):   $(SUBDIRS)
-       set EMACSLOADPATH=$(buildlisppath)
-       $(SETLOADPATH) $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \
+$(MISC_DIC):
+       $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \
            -f batch-miscdic-convert -dir quail $(srcdir)/MISC-DIC
-       $(SETLOADPATH) $(RUN_EMACS)  -l $(buildlisppath)/international/quail \
+       $(RUN_EMACS)  -l $(buildlisppath)/international/quail \
            -f batch-byte-compile $(MISC_DIC:.elc=.el)
 
-.SUFFIXES: .elc .el
-
-.el.elc:
-       set EMACSLOADPATH=$(buildlisppath)
-       $(SETLOADPATH) $(RUN_EMACS) -f batch-byte-compile $<
-
 leim-list.el: $(SUBDIRS) $(WORLD)
-       set EMACSLOADPATH=$(buildlisppath)
-       $(SETLOADPATH) $(RUN_EMACS) -l $(buildlisppath)/international/quail \
+       $(RUN_EMACS) -l $(buildlisppath)/international/quail \
            --eval $(ARGQUOTE)(update-leim-list-file $(DQUOTE).$(DQUOTE))$(ARGQUOTE)
 
 install: all
@@ -186,7 +185,6 @@ install: all
 
 clean mostlyclean:
        - $(FOREACH) $(TIT) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
-       - $(FOREACH) $(NONTIT) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
        - $(FOREACH) $(WORLD) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
        - $(FOREACH) $(MISC_DIC) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
        - $(FOREACH) $(TIT:.elc=.el) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)