mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-24 10:38:38 +00:00
dd6ab82fb5
Fix damage caused by trunk merge in emacs--unicode--0--patch-15
Some files in the emacs--cvs-trunk--0 branch had their arch id-tag changed
from tagline to explicit [because they were used as template files, and their
syntax didn't accommodate stripping comments, so the the generated files
caused id-tag conflicts when an in-tree build was done].
Unfortunately arch doesn't handle id-tag changes well, so this resulted in
the files appearing to be deleted, and then added again. When that changeset
was merged into the unicode branch, it resulted in unicode-specific changes
being dropped, and the trunk version being added.
To fix this, I restored these files to their pre-merge versions (from
emacs--unicode--0--patch-14), and then manually reapplied all changes from:
(1) the unicode branch from the bogus merge point to the current version
(emacs--unicode--0--patch-15 - emacs--unicode--0--patch-34)
(2) the trunk from the bogus merge point to the latest version which was
merged into the unicode branch
(emacs--cvs-trunk--0--patch-218 - emacs--cvs-trunk--0--patch-522)
and fixed any conflicts (mostly due to doubly-applied patch hunks that patch
couldn't detect).
256 lines
7.6 KiB
Makefile
256 lines
7.6 KiB
Makefile
# Makefile for leim subdirectory in GNU Emacs.
|
|
# Copyright (C) 1997,98,1999,2000,2001 Electrotechnical Laboratory, JAPAN.
|
|
# Licensed to the Free Software Foundation.
|
|
# Copyright (C) 1997,98,1999,2000,01,02,03,2004
|
|
# Free Software Foundation, Inc.
|
|
# Copyright (C) 2001,02,03,2004
|
|
# National Institute of Advanced Industrial Science and Technology (AIST)
|
|
# Registration Number H14PRO021
|
|
|
|
# This file is part of GNU Emacs.
|
|
|
|
# GNU Emacs is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2, or (at your option)
|
|
# any later version.
|
|
#
|
|
# GNU Emacs is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with GNU Emacs; see the file COPYING. If not, write to the
|
|
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
# Boston, MA 02111-1307, USA.
|
|
|
|
# Avoid trouble on systems where the `SHELL' variable might be
|
|
# inherited from the environment.
|
|
SHELL = /bin/sh
|
|
|
|
# Here are the things that we expect ../configure to edit.
|
|
version=@version@
|
|
prefix=@prefix@
|
|
datadir=@datadir@
|
|
srcdir=@srcdir@
|
|
|
|
# Where to install LEIM files.
|
|
INSTALLDIR=${datadir}/emacs/${version}/leim
|
|
|
|
# On Xenix and the IBM RS6000, double-dot gets screwed up.
|
|
dot = .
|
|
|
|
# Which Emacs to use to convert TIT files to Emacs Lisp files,
|
|
# byte-compile Emacs Lisp files, and generate the file leim-list.el.
|
|
BUILT-EMACS = ${dot}${dot}/src/emacs
|
|
|
|
buildlisppath=${srcdir}/${dot}${dot}/lisp
|
|
|
|
# How to run Emacs.
|
|
RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
|
|
${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte
|
|
|
|
# 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/CCDOSPY.elc \
|
|
quail/Punct.elc \
|
|
quail/QJ.elc \
|
|
quail/SW.elc \
|
|
quail/TONEPY.elc
|
|
|
|
# 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
|
|
|
|
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/hangul3.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/ethiopic.elc \
|
|
${srcdir}/quail/ipa.elc \
|
|
${srcdir}/quail/hebrew.elc \
|
|
${srcdir}/quail/georgian.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}
|
|
|
|
TIT-MISC=${CHINESE-TIT} ${MISC}
|
|
NON-TIT-MISC=${CHINESE-NON-TIT} ${JAPANESE} ${KOREAN} ${EUROPEAN} ${OTHERS}
|
|
|
|
.SUFFIXES: .elc .el
|
|
|
|
.el.elc:
|
|
${RUN-EMACS} -f batch-byte-compile $<
|
|
|
|
all: ${BUILT-EMACS} ${SUBDIRS} leim-list.el ${WORLD}
|
|
|
|
# To ensure that we can run Emacs. This target is ignored (never
|
|
# being hit) if a user changes default value of EMACS.
|
|
${dot}${dot}/src/emacs:
|
|
cd ../src; ${MAKE} ${MFLAGS} emacs
|
|
|
|
${SUBDIRS}:
|
|
mkdir $@
|
|
touch stamp-subdir
|
|
|
|
TIT-SOURCES= \
|
|
${srcdir}/CXTERM-DIC/4Corner.tit \
|
|
${srcdir}/CXTERM-DIC/ARRAY30.tit \
|
|
${srcdir}/CXTERM-DIC/CCDOSPY.tit \
|
|
${srcdir}/CXTERM-DIC/ECDICT.tit \
|
|
${srcdir}/CXTERM-DIC/ETZY.tit \
|
|
${srcdir}/CXTERM-DIC/PY-b5.tit \
|
|
${srcdir}/CXTERM-DIC/Punct-b5.tit \
|
|
${srcdir}/CXTERM-DIC/Punct.tit \
|
|
${srcdir}/CXTERM-DIC/QJ-b5.tit \
|
|
${srcdir}/CXTERM-DIC/QJ.tit \
|
|
${srcdir}/CXTERM-DIC/SW.tit \
|
|
${srcdir}/CXTERM-DIC/TONEPY.tit \
|
|
${srcdir}/CXTERM-DIC/ZOZY.tit
|
|
|
|
${CHINESE-TIT:.elc=.el}: changed.tit
|
|
@true
|
|
|
|
changed.tit: ${TIT-SOURCES}
|
|
${RUN-EMACS} -l ${buildlisppath}/international/titdic-cnv \
|
|
-f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \
|
|
echo "changed" > $@
|
|
|
|
MISC-SOURCES= \
|
|
${srcdir}/MISC-DIC/CTLau-b5.html \
|
|
${srcdir}/MISC-DIC/CTLau.html \
|
|
${srcdir}/MISC-DIC/cangjie-table.b5 \
|
|
${srcdir}/MISC-DIC/cangjie-table.cns \
|
|
${srcdir}/MISC-DIC/pinyin.map \
|
|
${srcdir}/MISC-DIC/ziranma.cin
|
|
|
|
${MISC:.elc=.el}: changed.misc
|
|
@true
|
|
|
|
changed.misc: ${MISC-SOURCES}
|
|
${RUN-EMACS} -l ${buildlisppath}/international/titdic-cnv \
|
|
-f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; \
|
|
echo "changed" > $@
|
|
|
|
leim-list.el: ${SUBDIRS} ${NON-TIT-MISC} changed.tit changed.misc ${srcdir}/leim-ext.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 \".\")" ; \
|
|
else \
|
|
${RUN-EMACS} -l ${buildlisppath}/international/quail \
|
|
--eval "(update-leim-list-file \".\" \"${srcdir}\")" ; \
|
|
fi
|
|
sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@
|
|
|
|
install: all
|
|
if [ x`(cd ${INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \
|
|
rm -rf ${INSTALLDIR}/leim-list.el; \
|
|
rm -rf ${INSTALLDIR}/quail ${INSTALLDIR}/ja-dic ; \
|
|
echo "Copying leim files to ${INSTALLDIR} ..." ; \
|
|
if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
|
|
tar -chf - leim-list.el quail ja-dic \
|
|
| (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\
|
|
else \
|
|
tar -chf - leim-list.el quail \
|
|
| (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\
|
|
cd ${srcdir}; \
|
|
tar -chf - quail/* ja-dic \
|
|
| (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\
|
|
fi; \
|
|
rm -rf ${INSTALLDIR}/CVS ${INSTALLDIR}/*/CVS; \
|
|
rm -f ${INSTALLDIR}/.cvsignore ${INSTALLDIR}/*/.cvsignore; \
|
|
rm -f ${INSTALLDIR}/.arch-inventory ${INSTALLDIR}/*/.arch-inventory; \
|
|
rm -f ${INSTALLDIR}/\#* ${INSTALLDIR}/*/\#* ; \
|
|
rm -f ${INSTALLDIR}/.\#* ${INSTALLDIR}/*/.\#* ; \
|
|
rm -f ${INSTALLDIR}/*~ ${INSTALLDIR}/*/*~ ; \
|
|
rm -f ${INSTALLDIR}/*.orig ${INSTALLDIR}/*/*.orig ; \
|
|
else true; fi
|
|
-chmod -R a+r ${INSTALLDIR}
|
|
|
|
clean mostlyclean:
|
|
rm -f ${TIT-MISC} ${TIT-MISC:.elc=.el} \
|
|
leim-list.el changed.tit changed.misc
|
|
|
|
distclean: clean
|
|
if test -f stamp-subdir; then rm -rf ${SUBDIRS} stamp-subdir; fi
|
|
rm -f Makefile
|
|
|
|
maintainer-clean: distclean
|
|
rm -f ${WORLD}
|
|
|
|
extraclean: maintainer-clean
|
|
-rm -f *~ \#* m/?*~ s/?*~
|