(calcFunc-usimplify): Add missing quote to defalias argument.

[bpt/emacs.git] / leim / makefile.w32-in

diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index 60612fa..1d84c4f 100644 (file)
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -36,26 +36,25 @@ 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/PY.elc            \
        quail/QJ.elc            \
        quail/SW.elc            \
-       quail/TONEPY.elc        \
-       quail/ZIRANMA.elc
+       quail/TONEPY.elc
 
 # Files generated from TIT dictionaries for Chinese BIG5 character set.
 TIT_BIG5=\
        quail/4Corner.elc       \
        quail/ARRAY30.elc       \
-       quail/CTLauB.elc        \
        quail/ECDICT.elc        \
        quail/ETZY.elc          \
        quail/Punct-b5.elc      \
@@ -67,24 +66,20 @@ CHINESE_TIT=$(TIT_GB) $(TIT_BIG5)
 
 NON_TIT_GB=$(srcdir)/quail/py-punct.elc
 
-NON_TIT_BIG5=$(srcdir)/quail/quick-b5.elc $(srcdir)/quail/tsang-b5.elc \
-            $(srcdir)/quail/pypunct-b5.elc
+NON_TIT_BIG5=$(srcdir)/quail/pypunct-b5.elc
 
-NON_TIT_CNS=$(srcdir)/quail/quick-cns.elc $(srcdir)/quail/tsang-cns.elc
-
-CHINESE_NON_TIT=$(NON_TIT_GB) $(NON_TIT_BIG5) $(NON_TIT_CNS)
+CHINESE_NON_TIT=$(NON_TIT_GB) $(NON_TIT_BIG5)
 
 CHINESE_GB=$(TIT_GB) $(NON_TIT_GB)
 
 CHINESE_BIG5=$(TIT_BIG5) $(NON_TIT_BIG5) 
 
-CHINESE_CNS=$(NON_TIT_CNS) 
-
 JAPANESE=$(srcdir)/quail/japanese.elc $(srcdir)/ja-dic/ja-dic.elc
 
 KOREAN=        $(srcdir)/quail/hangul.elc      \
        $(srcdir)/quail/hangul3.elc     \
        $(srcdir)/quail/hanja.elc       \
+       $(srcdir)/quail/hanja3.elc      \
        $(srcdir)/quail/hanja-jis.elc   \
        $(srcdir)/quail/symbol-ksc.elc
 
@@ -116,16 +111,26 @@ MISC= \
        $(srcdir)/quail/ipa.elc \
        $(srcdir)/quail/hebrew.elc
 
-CHINESE=$(CHINESE_GB) $(CHINESE_BIG5) $(CHINESE_CNS)
+MISC_DIC=\
+       quail/tsang-b5.elc      \
+       quail/quick-b5.elc      \
+       quail/tsang-cns.elc     \
+       quail/quick-cns.elc     \
+       quail/PY.elc            \
+       quail/ZIRANMA.elc       \
+       quail/CTLau.elc         \
+       quail/CTLau-b5.elc
+
+CHINESE=$(CHINESE_GB) $(CHINESE_BIG5)
 EASTASIA=$(CHINESE) $(JAPANESE) $(KOREAN)
 ASIA=$(EASTASIA) $(THAI) $(VIETNAMESE) $(LAO) $(INDIAN) $(TIBETAN)
 EUROPEAN=$(LATIN) $(SLAVIC) $(GREEK) $(RUSSIAN)
-WORLD=$(ASIA) $(EUROPEAN) $(MISC)
+WORLD=$(ASIA) $(EUROPEAN) $(MISC) $(MISC_DIC)
 
 TIT=$(CHINESE_TIT)
 NON_TIT=$(CHINESE_NON_TIT) $(JAPANESE) $(KOREAN) $(EUROPEAN) $(MISC)
 
-all: $(BUILT_EMACS) $(SUBDIRS) $(TIT) leim-list.el
+all: $(BUILT_EMACS) $(SUBDIRS) $(TIT) $(MISC_DIC) leim-list.el
 
 # To ensure that we can run Emacs.  This target is ignored (never
 # being hit) if a user changes default value of EMACS.
@@ -136,23 +141,36 @@ $(SUBDIRS):
        mkdir "$@"
        echo stamp>stamp-subdir
 
+# The rules which generate $(TIT) and ${MISC_DIC) files create them all
+# in one go.  So we need to prevent parallel execution for that target,
+# otherwise Emacs complains about files being locked.  .NOTPARALLEL is
+# for GNU Make, .NO_PARALLEL is for other Make's.
+.NOTPARALLEL: $(TIT) $(MISC_DIC)
+
+.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 \
-           --eval $(ARGQUOTE)(batch-titdic-convert t)$(ARGQUOTE) -dir quail $(srcdir)/CXTERM-DIC
-       $(SETLOADPATH) $(RUN_EMACS)  -l $(buildlisppath)/international/quail \
+       $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \
+           --eval $(ARGQUOTE)(batch-titdic-convert t)$(ARGQUOTE) \
+           -dir quail $(srcdir)/CXTERM-DIC
+       $(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)
+       $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \
+           -f batch-miscdic-convert -dir quail $(srcdir)/MISC-DIC
+       $(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 $<
+       $(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
@@ -167,7 +185,10 @@ install: all
 
 clean mostlyclean:
        - $(FOREACH) $(TIT) $(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)
+       - $(FOREACH) $(MISC_DIC:.elc=.el) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
        - $(DEL) leim-list.el
 
 distclean maintainer-clean: