Commit 4c1dadb1 authored by Andrew Innes's avatar Andrew Innes

(TIT_GB): Delete quail/PY.elc and

quail/ZIRANMA.elc.
(NON_TIT_BIG5): Delete $(srcdir)/quail/quick-b5.elc and
$(srcdir)/quail/tsang-b5.elc.
(NON_TIT_CNS): Delete.
(CHINESE_NON_TIT): Delete $(NON-TIT-CNS).
(CHINESE_CNS): Delete.
(KOREAN): Add ${srcdir}/quail/hanja3.elc.  From Kenichi Handa
<handa@etl.go.jp>.
(MISC_DIC): New variable.
(CHINESE): Delete $(CHINESE_CNS).
(WORLD): Add $(MISC_DIC).
(all): Depends on $(MISC_DIC).
(.NOTPARALLEL, .NO_PARALLEL): New special targets.
($(MISC_DIC)): New target.
(clean mostlyclean): Delete also $(NONTIT), $(WORLD), $(MISC_DIC)
and $(MISC_DIC:.elc=.el).
parent 97357fc9
2001-04-03 Andrew Innes <andrewi@gnu.org>
* makefile.w32-in (TIT_GB): Delete quail/PY.elc and
quail/ZIRANMA.elc.
(NON_TIT_BIG5): Delete $(srcdir)/quail/quick-b5.elc and
$(srcdir)/quail/tsang-b5.elc.
(NON_TIT_CNS): Delete.
(CHINESE_NON_TIT): Delete $(NON-TIT-CNS).
(CHINESE_CNS): Delete.
(KOREAN): Add ${srcdir}/quail/hanja3.elc. From Kenichi Handa
<handa@etl.go.jp>.
(MISC_DIC): New variable.
(CHINESE): Delete $(CHINESE_CNS).
(WORLD): Add $(MISC_DIC).
(all): Depends on $(MISC_DIC).
(.NOTPARALLEL, .NO_PARALLEL): New special targets.
($(MISC_DIC)): New target.
(clean mostlyclean): Delete also $(NONTIT), $(WORLD), $(MISC_DIC)
and $(MISC_DIC:.elc=.el).
2001-04-02 Eli Zaretskii <eliz@is.elta.co.il>
* Makefile.in (KOREAN): Add ${srcdir}/quail/hanja3.elc. From
......@@ -14,7 +34,7 @@
(CHINESE-CNS): Delete it.
(MISC-DIC): New variable.
(CHINESE): Delete ${CHINESE-CNS}.
(WORLD): Delete ${MISC-DIC}.
(WORLD): Add ${MISC-DIC}.
(all): Depends on ${MISC-DIC}.
(${MISC-DIC}): New target.
(clean mostlyclean): Delete also ${MISC-DIC} ${MISC-DIC:.elc=.el}.
......
......@@ -45,11 +45,9 @@ 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=\
......@@ -67,24 +65,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 +110,24 @@ 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
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,14 +138,31 @@ $(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
--eval $(ARGQUOTE)(batch-titdic-convert t)$(ARGQUOTE) \
-dir quail $(srcdir)/CXTERM-DIC
$(SETLOADPATH) $(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 \
-f batch-miscdic-convert -dir quail $(srcdir)/MISC-DIC
$(SETLOADPATH) $(RUN_EMACS) -l $(buildlisppath)/international/quail \
-f batch-byte-compile $(MISC_DIC:.elc=.el)
.SUFFIXES: .elc .el
.el.elc:
......@@ -167,7 +186,11 @@ 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)
- $(FOREACH) $(MISC_DIC:.elc=.el) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)
- $(DEL) leim-list.el
distclean maintainer-clean:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment