diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | leim/Makefile.in | 9 | ||||
| -rw-r--r-- | lisp/international/ja-dic-cnv.el | 2 | ||||
| -rwxr-xr-x | make-dist | 1 |
4 files changed, 12 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index b09a0c030b3..3cec4cc0685 100644 --- a/.gitignore +++ b/.gitignore @@ -95,6 +95,7 @@ lisp/cedet/semantic/grammar-wy.el lisp/eshell/esh-groups.el lisp/finder-inf.el lisp/leim/ja-dic/ +leim/small-ja-dic-option lisp/leim/leim-list.el lisp/leim/quail/4Corner.el lisp/leim/quail/ARRAY30.el diff --git a/leim/Makefile.in b/leim/Makefile.in index 4c6c3179283..f7dfdf66f30 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -26,6 +26,7 @@ SHELL = @SHELL@ # Here are the things that we expect ../configure to edit. srcdir=@srcdir@ top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ # Where the generated files go. leimdir = ${srcdir}/../lisp/leim @@ -134,9 +135,15 @@ ${leimdir}/leim-list.el: ${srcdir}/leim-ext.el ${TIT_MISC} ${leimdir}/ja-dic/ja-dic.el: | $(leimdir)/ja-dic +# This is used to support regeneration of ja-dic when the SMALL_JA_DIC +# option is flipped by the configure-time option. +small-ja-dic-option: ../config.status + $(AM_V_GEN)echo "Small ja-dic option: $(SMALL_JA_DIC)" > $@.$$$$ && \ + ${top_srcdir}/build-aux/move-if-change $@.$$$$ $@ + .PHONY: generate-ja-dic generate-ja-dic: ${leimdir}/ja-dic/ja-dic.el -${leimdir}/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L +${leimdir}/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L small-ja-dic-option $(AM_V_GEN)$(RUN_EMACS) -batch -l ja-dic-cnv \ -f batch-skkdic-convert -dir "$(leimdir)/ja-dic" $(JA_DIC_NO_REDUCTION_OPTION) "$<" diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el index 9ce31f11d91..c507aa58807 100644 --- a/lisp/international/ja-dic-cnv.el +++ b/lisp/international/ja-dic-cnv.el @@ -346,6 +346,8 @@ If NO-REDUCTION is non-nil, do not reduce the dictionary vocabulary." (erase-buffer) (buffer-disable-undo) (generate-lisp-file-heading ja-dic-filename 'skkdic-convert :code nil) + (insert (format ";; Generated with small ja-dic option: %s\n\n" + (if no-reduction "no" "yes"))) (insert ";; Original SKK dictionary file: " (file-relative-name (expand-file-name filename) dirname) "\n\n" diff --git a/make-dist b/make-dist index 80c672dbf3a..57881d50f0d 100755 --- a/make-dist +++ b/make-dist @@ -357,6 +357,7 @@ possibly_non_vc_files=" MANIFEST aclocal.m4 configure admin/charsets/jisx2131-filter src/config.in + leim/small-ja-dic-option "$( find admin doc etc lisp \ \( -name '*.el' -o -name '*.elc' -o -name '*.map' -o -name '*.stamp' \ |