Commit 41455956 authored by Glenn Morris's avatar Glenn Morris

Make leim/Makefile compute the list of .el files like lisp/Makefile

* leim/Makefile.in: (TIT_GB, TIT_BIG5, CHINESE_TIT, MISC, TIT_MISC):
Make them store the .el files rather than the .elc files.
(NON_TIT_GB, NON_TIT_BIG5, CHINESE_NON_TIT, CHINESE_GB)
(CHINESE_GB, CHINESE_BIG5, JAPANESE, KOREAN, THAI, VIETNAMESE)
(LAO, INDIAN, TIBETAN, LATIN, UNICODE, SLAVIC, GREEK, RUSSIAN)
(OTHERS, CHINESE, EASTASIA, ASIA, EUROPEAN, WORLD, NON_TIT_MISC):
Remove variables listing the non-generated .el files.
(.el.elc): Add explicit load-path for quail.
(all): Depend on compile-main rule rather than $WORLD.
(changed.tit, changed.misc): Also depend on $SUBDIRS.
(leim-list.el): Don't depend on changed.tit or changed.misc.
Remove unnecessary compilation check.
(setwins, compile-targets, compile-main): New.
(clean, mostlyclean): Update for change in TIT_MISC contents.
(bootstrap-clean): Use a glob match to delete .elc, not a fixed list.
parent f8f2e1d8
2012-04-09 Glenn Morris <rgm@gnu.org>
* Makefile.in: Compute the list of .el files to be compiled dynamically,
as the lisp/ directory does, rather than hard-coding it.
(TIT_GB, TIT_BIG5, CHINESE_TIT, MISC, TIT_MISC):
Make them store the .el files rather than the .elc files.
(NON_TIT_GB, NON_TIT_BIG5, CHINESE_NON_TIT, CHINESE_GB)
(CHINESE_GB, CHINESE_BIG5, JAPANESE, KOREAN, THAI, VIETNAMESE)
(LAO, INDIAN, TIBETAN, LATIN, UNICODE, SLAVIC, GREEK, RUSSIAN)
(OTHERS, CHINESE, EASTASIA, ASIA, EUROPEAN, WORLD, NON_TIT_MISC):
Remove variables listing the non-generated .el files.
(.el.elc): Add explicit load-path for quail.
(all): Depend on compile-main rule rather than $WORLD.
(changed.tit, changed.misc): Also depend on $SUBDIRS.
(leim-list.el): Don't depend on changed.tit or changed.misc.
Remove unnecessary compilation check.
(setwins, compile-targets, compile-main): New.
(clean, mostlyclean): Update for change in TIT_MISC contents.
(bootstrap-clean): Use a glob match to delete .elc, not a fixed list.
2012-04-09 Stefan Monnier <monnier@iro.umontreal.ca>
* quail/latin-ltx.el: Auto-generate some of the entries.
......
# Makefile for leim subdirectory in GNU Emacs.
# Copyright (C) 1997-2012 Free Software Foundation, Inc.
# Copyright (C) 1997-2012 Free Software Foundation, Inc.
# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
# 2006, 2007, 2008, 2009, 2010, 2011
# National Institute of Advanced Industrial Science and Technology (AIST)
......@@ -55,110 +55,48 @@ SUBDIRS=quail
# Files generated from TIT dictionaries for Chinese GB character set.
TIT_GB=\
quail/CCDOSPY.elc \
quail/Punct.elc \
quail/QJ.elc \
quail/SW.elc \
quail/TONEPY.elc
quail/CCDOSPY.el \
quail/Punct.el \
quail/QJ.el \
quail/SW.el \
quail/TONEPY.el
# Files generated from TIT dictionaries for Chinese BIG5 character set.
TIT_BIG5=\
quail/4Corner.elc \
quail/ARRAY30.elc \
quail/ECDICT.elc \
quail/ETZY.elc \
quail/Punct-b5.elc \
quail/PY-b5.elc \
quail/QJ-b5.elc \
quail/ZOZY.elc
quail/4Corner.el \
quail/ARRAY30.el \
quail/ECDICT.el \
quail/ETZY.el \
quail/Punct-b5.el \
quail/PY-b5.el \
quail/QJ-b5.el \
quail/ZOZY.el
CHINESE_TIT=${TIT_GB} ${TIT_BIG5}
NON_TIT_GB=${srcdir}/quail/py-punct.elc
NON_TIT_BIG5=${srcdir}/quail/pypunct-b5.elc
CHINESE_NON_TIT=${NON_TIT_GB} ${NON_TIT_BIG5}
CHINESE_GB=${TIT_GB} ${NON_TIT_GB}
CHINESE_BIG5=${TIT_BIG5} ${NON_TIT_BIG5}
JAPANESE=${srcdir}/quail/japanese.elc ${srcdir}/ja-dic/ja-dic.elc
KOREAN= ${srcdir}/quail/hangul.elc \
${srcdir}/quail/hanja.elc \
${srcdir}/quail/hanja3.elc \
${srcdir}/quail/hanja-jis.elc \
${srcdir}/quail/symbol-ksc.elc
THAI=${srcdir}/quail/thai.elc
VIETNAMESE=${srcdir}/quail/viqr.elc ${srcdir}/quail/vntelex.elc
LAO=${srcdir}/quail/lao.elc ${srcdir}/quail/lrt.elc
INDIAN=${srcdir}/quail/indian.elc
TIBETAN=${srcdir}/quail/tibetan.elc
LATIN= ${srcdir}/quail/latin-pre.elc \
${srcdir}/quail/latin-post.elc \
${srcdir}/quail/latin-alt.elc \
${srcdir}/quail/latin-ltx.elc \
${srcdir}/quail/welsh.elc
UNICODE=${srcdir}/quail/sgml-input.elc ${srcdir}/quail/rfc1345.elc \
${srcdir}/quail/uni-input.elc
SLAVIC= \
${srcdir}/quail/czech.elc \
${srcdir}/quail/croatian.elc \
${srcdir}/quail/slovak.elc
GREEK=${srcdir}/quail/greek.elc
RUSSIAN=${srcdir}/quail/cyrillic.elc ${srcdir}/quail/cyril-jis.elc
OTHERS= \
${srcdir}/quail/arabic.elc \
${srcdir}/quail/ethiopic.elc \
${srcdir}/quail/ipa.elc \
${srcdir}/quail/ipa-praat.elc \
${srcdir}/quail/hebrew.elc \
${srcdir}/quail/georgian.elc \
$(srcdir)/quail/persian.elc \
${srcdir}/quail/sisheng.elc
MISC= \
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} ${OTHERS} ${MISC} ${UNICODE}
quail/tsang-b5.el \
quail/quick-b5.el \
quail/tsang-cns.el \
quail/quick-cns.el \
quail/PY.el \
quail/ZIRANMA.el \
quail/CTLau.el \
quail/CTLau-b5.el
## The generated .el files.
TIT_MISC=${CHINESE_TIT} ${MISC}
NON_TIT_MISC=${CHINESE_NON_TIT} ${JAPANESE} ${KOREAN} ${EUROPEAN} ${OTHERS}
.SUFFIXES: .elc .el
.el.elc:
@echo Compiling $<
@${RUN_EMACS} -f batch-byte-compile $<
@${RUN_EMACS} -l ${buildlisppath}/international/quail -f batch-byte-compile $<
all: ${BUILT_EMACS} ${SUBDIRS} leim-list.el ${WORLD}
all: ${BUILT_EMACS} ${SUBDIRS} leim-list.el compile-main
# To ensure that we can run Emacs. This target is ignored (never
# being hit) if a user changes default value of EMACS.
# being hit) if a user changes default value of BUILT_EMACS.
../src/emacs:
cd ../src; ${MAKE} ${MFLAGS} emacs
......@@ -181,10 +119,12 @@ TIT_SOURCES= \
${srcdir}/CXTERM-DIC/TONEPY.tit \
${srcdir}/CXTERM-DIC/ZOZY.tit
${CHINESE_TIT:.elc=.el}: changed.tit
${CHINESE_TIT}: changed.tit
@true
changed.tit: ${TIT_SOURCES}
## FIXME remove subdirs if poss - time-stamping.
## Emacs should make the directory if it does not exist.
changed.tit: ${SUBDIRS} ${TIT_SOURCES}
${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \
-f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \
echo "changed" > $@
......@@ -197,18 +137,16 @@ MISC_SOURCES= \
${srcdir}/MISC-DIC/pinyin.map \
${srcdir}/MISC-DIC/ziranma.cin
${MISC:.elc=.el}: changed.misc
${MISC}: changed.misc
@true
changed.misc: ${MISC_SOURCES}
changed.misc: ${SUBDIRS} ${MISC_SOURCES}
${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \
-f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; \
echo "changed" > $@
leim-list.el: ${SUBDIRS} ${TIT_MISC} changed.tit changed.misc ${srcdir}/leim-ext.el
leim-list.el: ${SUBDIRS} ${TIT_MISC} ${srcdir}/leim-ext.el
rm -f leim-list.el
${RUN_EMACS} -l ${buildlisppath}/international/quail \
-f batch-byte-compile-if-not-done ${TIT_MISC:.elc=.el}
if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
${RUN_EMACS} -l ${buildlisppath}/international/quail \
--eval "(update-leim-list-file \".\")" ; \
......@@ -218,6 +156,29 @@ leim-list.el: ${SUBDIRS} ${TIT_MISC} changed.tit changed.misc ${srcdir}/leim-ext
fi
sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@
## Following adapted from lisp/Makefile.in.
setwins=wins="${srcdir}/ja-dic quail"; \
[ `cd ${srcdir} && /bin/pwd` != `/bin/pwd` ] && \
wins="$$wins ${srcdir}/quail"
.PHONY: compile-targets
# TARGETS is set dynamically in the recursive call from `compile-main'.
compile-targets: $(TARGETS)
# Compile all the Elisp files that need it. Beware: it approximates
# `no-byte-compile', so watch out for false-positives!
compile-main: ${TIT_MISC}
@($(setwins); \
els=`echo "$$wins " | sed -e 's| |/*.el |g'`; \
for el in $$els; do \
test -f $$el || continue; \
test ! -f $${el}c && GREP_OPTIONS= grep '^;.*no-byte-compile: t' $$el > /dev/null && continue; \
echo "$${el}c"; \
done | xargs echo) | \
while read chunk; do \
$(MAKE) $(MFLAGS) compile-targets BUILT_EMACS="$(BUILT_EMACS)" TARGETS="$$chunk"; \
done
MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done
install: all
......@@ -266,16 +227,14 @@ install: all
else true ; fi
clean mostlyclean:
rm -f ${TIT_MISC} ${TIT_MISC:.elc=.el} \
rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \
leim-list.el changed.tit changed.misc
# The following target is needed because the `clean' target only removes
# TIT-generated files and doesn't touch compiled Quail packages. But
# bootstrapping should not leave non-fresh .elc files behind.
bootstrap-clean: clean
rm -f ${WORLD}
## FIXME some compiled files go to srcdir, some don't?
# cd ${srcdir}; rm -f *.elc */*.elc
$(setwins); for w in $$wins; do rm -f $$w/*.elc; done
distclean: clean
if test -f stamp-subdir; then rm -rf ${SUBDIRS} stamp-subdir; fi
......
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