From cb6c95a394d9a9d2f068bf8ee240f2d2297867d1 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 26 Nov 2013 22:15:06 -0800 Subject: Move runtime leim lisp files to lisp/leim directory This allows us to reuse much of the lisp build and installation machinery, rather than duplicating it. * Makefile.in (abs_builddir, leimdir): Remove. (buildlisppath, SUBDIR, COPYDIR, COPYDESTS): No more leim directory. (epaths-force-w32): No longer set BLD. (leim): Remove. (install-arch-indep): No longer run or install leim. (mostlyclean, clean): No longer run leim rule. (bootstrap-clean): Change leim target. (maintainer-clean): Add leim. (check-declare): Remove leim. * README: Update for leim changes. * configure.ac (leimdir): Remove. (standardlisppath): No more leimdir. * make-dist: Update for files from leim/ now being in lisp/leim/. * doc/lispref/loading.texi (Library Search): * doc/lispref/os.texi (Startup Summary): No more leim directory. * leim/Makefile.in (leimdir): New variable. (TIT_GB, TIT_BIG5, MISC, changed.tit, changed.misc) (${leimdir}/leim-list.el, ${leimdir}/ja-dic/ja-dic.el): Generate in $leimdir. (all): Remove compilation, add ja-dic. (leim-list.el): Now PHONY. (setwins, compile-targets, compile-main, clean, mostlyclean) (extraclean): Remove. (bootstrap-clean): Delete all generated files. * leim/README: Update for moved leim/ directory. * leim/leim-ext.el (ucs-input-activate, hangul-input-method-activate): Remove manual autoloads; now in loaddefs.el. Disable byte-compile, version-control, autoloads in the output. * lisp/Makefile.in (setwins_for_subdirs): Skip leim/ directory. (compile-main): Depend on lisp/leim rule. (leim): New rule. * lisp/loadup.el: Move leim-list.el to leim/ subdirectory. * lisp/startup.el (normal-top-level): No more leim directory. * lisp/international/ja-dic-cnv.el (skkdic-convert): Disable version-control and autoloads in output files. * lisp/international/titdic-cnv.el (titdic-convert, miscdic-convert): Disable version-control and autoloads in output files. * lisp/leim/quail: Move here from ../leim. * lisp/leim/quail/hangul.el (hangul-input-method-activate): Add autoload cookie. (generated-autoload-load-name): Set file-local value. * lisp/leim/quail/uni-input.el (ucs-input-activate): Add autoload cookie. (generated-autoload-load-name): Set file-local value. * nt/README.W32: * nt/addpm.c (env_vars): * nt/epaths.nt (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH): * nt/paths.h (PATH_LOADSEARCH): No more leim directory. * src/Makefile.in (leimdir): Now in lisp source directory. ($(leimdir)/leim-list.el): Just use ../leim . * src/epaths.in (PATH_DUMPLOADSEARCH): * src/lread.c (load_path_default): * src/nsterm.m (ns_load_path): No more leim directory. * .bzrignore: Update for relocated leim files. --- leim/README | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'leim/README') diff --git a/leim/README b/leim/README index f1075872f7..c9c5447bd6 100644 --- a/leim/README +++ b/leim/README @@ -20,24 +20,22 @@ This directory contains various dictionaries for Chinese input methods. These dictionaries are automatically converted to Quail packages (Emacs Lisp source files) by `make'. -quail: - -This directory contains Emacs Lisp source files for Quail packages. - SKK-DIC: This directory contains source dictionary for Japanese input method -distributed with SKK (Japanese input method run with Mule). But, you -don't need this file because we distribute an Emacs Lisp source file -ja-dic/ja-dic.el which has already been converted from the source -dictionary (See below). +distributed with SKK (Japanese input method run with Mule). + + +The above source files are used to generate the following outputs: + +../lisp/leim/quail: + +This directory contains Emacs Lisp source files for Quail packages. -ja-dic: +../lisp/leim/ja-dic: -This directory contains Emacs Lisp source file ja-dic.el which is -generated from a source dictionary in SKK-DIC directory. The -inclusion of this file is for users convenience because it takes -rather long time to generate it. +This directory contains Emacs Lisp source file ja-dic.el, +generated from a source dictionary in SKK-DIC directory. This file is part of GNU Emacs. -- cgit v1.2.3