summaryrefslogtreecommitdiff
path: root/leim
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-01-03 18:43:27 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2015-01-03 18:54:34 -0800
commitc895d02ca13c4f1b57daf75755d32352502b9489 (patch)
treed14dc46c4290a26058e94df8ada37051052229a3 /leim
parent4e2358292540786bcaea085e8094a728d1aa0c30 (diff)
downloademacs-c895d02ca13c4f1b57daf75755d32352502b9489.tar.gz
Less 'make' chatter for leim
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) (am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0) (am__v_at_1): New macros, from src/Makefile.in. (${leimdir}/quail/%.el, misc_convert, ${leimdir}/leim-list.el) (${leimdir}/ja-dic/ja-dic.el): Use them.
Diffstat (limited to 'leim')
-rw-r--r--leim/ChangeLog9
-rw-r--r--leim/Makefile.in26
2 files changed, 29 insertions, 6 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog
index c8586224ab0..4bda9a64335 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-04 Paul Eggert <eggert@cs.ucla.edu>
+
+ Less 'make' chatter for leim
+ * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
+ (am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0)
+ (am__v_at_1): New macros, from src/Makefile.in.
+ (${leimdir}/quail/%.el, misc_convert, ${leimdir}/leim-list.el)
+ (${leimdir}/ja-dic/ja-dic.el): Use them.
+
2014-12-14 Paul Eggert <eggert@cs.ucla.edu>
* SKK-DIC/SKK-JISYO.L: Update to version 1.1216.
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 721565ea5bd..573acf7678c 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -29,6 +29,19 @@ srcdir=@srcdir@
# Where the generated files go.
leimdir = ${srcdir}/../lisp/leim
+# 'make' verbosity.
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+
# Prevent any settings in the user environment causing problems.
unexport EMACSDATA EMACSDOC EMACSPATH
@@ -88,11 +101,12 @@ ${leimdir}/quail ${leimdir}/ja-dic:
## All of TIT_GB and TIT_BIG5.
${leimdir}/quail/%.el: ${srcdir}/CXTERM-DIC/%.tit
- ${RUN_EMACS} -l titdic-cnv \
+ $(AM_V_GEN)${RUN_EMACS} -l titdic-cnv \
-f batch-titdic-convert -dir ${leimdir}/quail $<
-misc_convert = ${RUN_EMACS} -l titdic-cnv -f batch-miscdic-convert -dir ${leimdir}/quail
+misc_convert = $(AM_V_GEN)${RUN_EMACS} \
+ -l titdic-cnv -f batch-miscdic-convert -dir ${leimdir}/quail
## CTLau.el, CTLau-b5.el.
${leimdir}/quail/CT%.el: ${srcdir}/MISC-DIC/CT%.html
@@ -114,16 +128,16 @@ ${leimdir}/quail/tsang-%.el ${leimdir}/quail/quick-%.el: ${srcdir}/MISC-DIC/cang
leim-list.el: ${leimdir}/leim-list.el
${leimdir}/leim-list.el: ${srcdir}/leim-ext.el ${TIT_MISC}
- rm -f $@
- ${RUN_EMACS} -l international/quail \
+ $(AM_V_GEN)rm -f $@
+ $(AM_V_at)${RUN_EMACS} -l international/quail \
--eval "(update-leim-list-file (unmsys--file-name \"${leimdir}\"))"
- sed -n -e '/^[^;]/p' -e 's/^;\(;*\)inc /;\1 /p' < $< >> $@
+ $(AM_V_at)sed -n -e '/^[^;]/p' -e 's/^;\(;*\)inc /;\1 /p' < $< >> $@
${leimdir}/ja-dic/ja-dic.el: | $(leimdir)/ja-dic
${leimdir}/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L
- $(RUN_EMACS) -batch -l ja-dic-cnv \
+ $(AM_V_GEN)$(RUN_EMACS) -batch -l ja-dic-cnv \
-f batch-skkdic-convert -dir "$(leimdir)/ja-dic" "$<"