merge master

2 files changed, 13 insertions, 1 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index dc029a0be0c..2b04281f400 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Say "ELC foo.elc" instead of "GEN foo.elc"
+        * unidata/Makefile.in (AM_V_ELC, am__v_ELC_, am__v_ELC_0)
+        (am__v_ELC_1): New macros.
+        (%.elc): Use them.
+
 2015-01-08  Glenn Morris  <rgm@gnu.org>
 
         * authors.el (authors-aliases): Add an entry to ignore.
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 777d1270fff..1396f0926f4 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -34,6 +34,11 @@ emacs = "${EMACS}" -batch --no-site-file --no-site-lisp
 # 'make' verbosity.
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 
+AM_V_ELC = $(am__v_ELC_@AM_V@)
+am__v_ELC_ = $(am__v_ELC_@AM_DEFAULT_V@)
+am__v_ELC_0 = @echo "  ELC     " $@;
+am__v_ELC_1 =
+
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
@@ -58,7 +63,7 @@ ${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt | \
           > $@
 
 %.elc: %.el
-        $(AM_V_GEN)${emacs} -f batch-byte-compile $<
+        $(AM_V_ELC)${emacs} -f batch-byte-compile $<
 
 unidata.txt: ${srcdir}/UnicodeData.txt
         $(AM_V_GEN)sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' \