X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/fec2107c58835163dc3b08c0a833a5072aa1fca9..4dc7c8d5795458e89d19b59f64760e155c2cd70b:/leim/Makefile.in diff --git a/leim/Makefile.in b/leim/Makefile.in index af93d26351..04f64c0ce0 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -1,6 +1,6 @@ # Makefile for leim subdirectory in GNU Emacs. -# Copyright (C) 1997-2011 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) @@ -27,143 +27,61 @@ SHELL = /bin/sh # Here are the things that we expect ../configure to edit. -version=@version@ -prefix=@prefix@ -datarootdir=@datarootdir@ -datadir=@datadir@ srcdir=@srcdir@ -ns_appresdir=@ns_appresdir@ - -# Where to install LEIM files. -INSTALLDIR=$(DESTDIR)${datadir}/emacs/${version}/leim - -GZIP_PROG = @GZIP_PROG@ # 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 = ../src/emacs +EMACS = ../src/emacs buildlisppath=${srcdir}/../lisp # How to run Emacs. RUN_EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \ - ${BUILT_EMACS} -batch --no-site-file --no-site-lisp + ${EMACS} -batch --no-site-file --no-site-lisp -# Subdirectories to be made if ${srcdir} is different from the current -# directory. -SUBDIRS=quail +MKDIR_P = @MKDIR_P@ # 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 +TIT_BIG5=\ + 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/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 $< - -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. -../src/emacs: - cd ../src; ${MAKE} ${MFLAGS} emacs + @${RUN_EMACS} -l ${buildlisppath}/international/quail -f batch-byte-compile $< -${SUBDIRS}: - mkdir $@ - touch stamp-subdir +all: leim-list.el compile-main TIT_SOURCES= \ ${srcdir}/CXTERM-DIC/4Corner.tit \ @@ -180,10 +98,19 @@ TIT_SOURCES= \ ${srcdir}/CXTERM-DIC/TONEPY.tit \ ${srcdir}/CXTERM-DIC/ZOZY.tit -${CHINESE_TIT:.elc=.el}: changed.tit +${CHINESE_TIT}: changed.tit @true +## The changed.* files act to serialize this part of the build. +## A single Emacs invocation creates all the CHINESE_TIT files. +## Otherwise in a parallel build multiple Emacs instances could +## interfere with each other. If we used GNU make we could probably +## parallelize this without the need for an explicit rule for each +## file. Something like the pattern rule: +## quail/%.el: CXTERM-DIC/%.tit +## It doesn't seem possible to do this with VPATH and suffix rules. changed.tit: ${TIT_SOURCES} + @${MKDIR_P} quail ${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \ -f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \ echo "changed" > $@ @@ -196,19 +123,18 @@ 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} + @${MKDIR_P} quail ${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: ${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 \ + if [ x`cd ${srcdir} && /bin/pwd` = x`/bin/pwd` ] ; then \ ${RUN_EMACS} -l ${buildlisppath}/international/quail \ --eval "(update-leim-list-file \".\")" ; \ else \ @@ -217,67 +143,41 @@ leim-list.el: ${SUBDIRS} ${TIT_MISC} changed.tit changed.misc ${srcdir}/leim-ext fi sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@ -MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done - -install: all - if [ ! -d ${INSTALLDIR} ] ; then \ - umask 022; ${srcdir}/../install-sh -d ${INSTALLDIR}; \ - else true; fi - if [ x`(cd ${INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \ - rm -f ${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 -f ${INSTALLDIR}/.gitignore ${INSTALLDIR}/*/.gitignore; \ - 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 - -unset CDPATH; \ - if [ -n "${GZIP_PROG}" ]; \ - then \ - echo "Compressing *.el ..." ; \ - (cd ${INSTALLDIR}; for f in `find . -name "*.elc" -print`; do \ - ${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \ - done) \ - else true; fi - -chmod -R a+r ${INSTALLDIR} - for installuser in $${LOGNAME} $${USERNAME} $${USER} \ - `id -un 2> /dev/null`; do \ - [ -n "$${installuser}" ] && break ; \ - done ; \ - find ${INSTALLDIR} -exec chown $${installuser} '{}' ';' - if [ "${ns_appresdir}" != "" ]; then \ - ( cd ${ns_appresdir} ; \ - if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ - rm -fr share ) ; \ - else true ; fi +## 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 EMACS="$(EMACS)" TARGETS="$$chunk"; \ + done 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 + -[ `cd ${srcdir} && /bin/pwd` != `/bin/pwd` ] && rm -rf quail rm -f Makefile maintainer-clean: distclean bootstrap-clean