X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c07a4c0b599e0debfb10acdf02ac6559b998a88a..d0065ff1244871c9eb40420b88fc89f9f008b587:/leim/Makefile.in diff --git a/leim/Makefile.in b/leim/Makefile.in index 21561a357d..a5c05d567e 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -1,6 +1,6 @@ -# Makefile for leim subdirectory in GNU Emacs. +### @configure_input@ -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2013 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) @@ -21,37 +21,21 @@ # You should have received a copy of the GNU General Public License # along with GNU Emacs. If not, see . - -# Avoid trouble on systems where the `SHELL' variable might be -# inherited from the environment. -SHELL = /bin/sh +SHELL = @SHELL@ # 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. EMACS = ../src/emacs -buildlisppath=${srcdir}/../lisp - # How to run Emacs. -RUN_EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \ - ${EMACS} -batch --no-site-file --no-site-lisp +# Prevent any setting of EMACSLOADPATH in user environment causing problems. +RUN_EMACS = unset EMACSLOADPATH; "${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=\ @@ -91,13 +75,10 @@ TIT_MISC=${CHINESE_TIT} ${MISC} .el.elc: @echo Compiling $< - @${RUN_EMACS} -l ${buildlisppath}/international/quail -f batch-byte-compile $< - -all: ${SUBDIRS} leim-list.el compile-main + @${RUN_EMACS} -l international/quail -f batch-byte-compile $< -${SUBDIRS}: - mkdir $@ - touch stamp-subdir +all: leim-list.el compile-main +.PHONY: all TIT_SOURCES= \ ${srcdir}/CXTERM-DIC/4Corner.tit \ @@ -117,10 +98,17 @@ TIT_SOURCES= \ ${CHINESE_TIT}: changed.tit @true -## 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 \ +## 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 titdic-cnv \ -f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \ echo "changed" > $@ @@ -135,25 +123,32 @@ MISC_SOURCES= \ ${MISC}: changed.misc @true -changed.misc: ${SUBDIRS} ${MISC_SOURCES} - ${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \ +changed.misc: ${MISC_SOURCES} + @${MKDIR_P} quail + ${RUN_EMACS} -l titdic-cnv \ -f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; \ echo "changed" > $@ -leim-list.el: ${SUBDIRS} ${TIT_MISC} ${srcdir}/leim-ext.el +leim-list.el: ${TIT_MISC} ${srcdir}/leim-ext.el rm -f leim-list.el - if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \ - ${RUN_EMACS} -l ${buildlisppath}/international/quail \ + if [ "`cd ${srcdir} && /bin/pwd`" = "`/bin/pwd`" ] ; then \ + ${RUN_EMACS} -l international/quail \ --eval "(update-leim-list-file \".\")" ; \ else \ - ${RUN_EMACS} -l ${buildlisppath}/international/quail \ - --eval "(update-leim-list-file \".\" \"${srcdir}\")" ; \ + ${RUN_EMACS} -l international/quail \ + --eval "(update-leim-list-file \".\" (unmsys--file-name \"${srcdir}\"))" ; \ fi sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@ +$(srcdir)/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L + @$(MKDIR_P) $(srcdir)/ja-dic + $(RUN_EMACS) -batch -l ja-dic-cnv \ + -f batch-skkdic-convert -dir "$(srcdir)/ja-dic" \ + "$(srcdir)/SKK-DIC/SKK-JISYO.L" + ## Following adapted from lisp/Makefile.in. setwins=wins="${srcdir}/ja-dic quail"; \ - [ `cd ${srcdir} && /bin/pwd` != `/bin/pwd` ] && \ + [ "`cd ${srcdir} && /bin/pwd`" != "`/bin/pwd`" ] && \ wins="$$wins ${srcdir}/quail" .PHONY: compile-targets @@ -162,7 +157,8 @@ 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} +.PHONY: compile-main +compile-main: ${TIT_MISC} $(srcdir)/ja-dic/ja-dic.el @($(setwins); \ els=`echo "$$wins " | sed -e 's| |/*.el |g'`; \ for el in $$els; do \ @@ -174,52 +170,7 @@ compile-main: ${TIT_MISC} $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \ done -MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done - -install: all - if [ ! -d ${INSTALLDIR} ] ; then \ - umask 022; ${srcdir}/../build-aux/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 +.PHONY: clean mostlyclean bootstrap-clean distclean maintainer-clean extraclean clean mostlyclean: rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \ @@ -232,7 +183,7 @@ bootstrap-clean: clean $(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 @@ -243,5 +194,5 @@ extraclean: maintainer-clean .PHONY: check-declare check-declare: - $(RUN_EMACS) -l $(buildlisppath)/emacs-lisp/check-declare \ - --eval '(check-declare-directory "$(srcdir)")' + $(RUN_EMACS) -l check-declare \ + --eval '(check-declare-directory (unmsys--file-name "$(srcdir)"))'