diff options
| author | Glenn Morris <[email protected]> | 2014-06-24 23:03:13 -0700 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2014-06-24 23:03:13 -0700 |
| commit | 4c920f37c5bc731149814adbe3cf5c8d876f0417 (patch) | |
| tree | 65154f58db4767e3a639a82f525067e4beaccc9f /admin | |
| parent | 448dd61ceba6e2395a1571e17ee63bdc2ccd06a6 (diff) | |
admin/unidata: small Makefile simplifications
* admin/unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Make and load .elc.
(.el.elc): Replace with pattern rule.
(%.elc): New.
(unidata.txt): Use $<.
(compile): Remove.
(${DSTDIR}/charprop.el): Use order-only prereqs rather than a sub-make.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 7 | ||||
| -rw-r--r-- | admin/unidata/Makefile.in | 21 |
2 files changed, 17 insertions, 11 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index a7eb42e321..d53049f95c 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,5 +1,12 @@ 2014-06-25 Glenn Morris <[email protected]> + * unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Make and load .elc. + (.el.elc): Replace with pattern rule. + (%.elc): New. + (unidata.txt): Use $<. + (compile): Remove. + (${DSTDIR}/charprop.el): Use order-only prereqs rather than a sub-make. + * unidata/uvs.el (uvs-print-table-ivd): Fix free variable typo. 2014-06-21 Glenn Morris <[email protected]> diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in index c86fff0bab..6b253ea565 100644 --- a/admin/unidata/Makefile.in +++ b/admin/unidata/Makefile.in @@ -35,24 +35,23 @@ emacs = "${EMACS}" -batch --no-site-file --no-site-lisp all: ${top_srcdir}/src/macuvs.h ${DSTDIR}/charprop.el -${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt - ${EMACS} -batch -l "${srcdir}/uvs.el" \ +## Specify .elc as an order-only prereq so as to not needlessly rebuild +## target just because the .elc is missing. +## Same with charprop.el below. +${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt | \ + ${srcdir}/uvs.elc + ${emacs} -L ${srcdir} -l uvs \ --eval '(uvs-print-table-ivd "${srcdir}/IVD_Sequences.txt" "Adobe-Japan1")' \ > $@ -.el.elc: +%.elc: %.el ${emacs} -f batch-byte-compile $< unidata.txt: ${srcdir}/UnicodeData.txt - sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < ${srcdir}/UnicodeData.txt > $@ + sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < $< > $@ -compile: ${srcdir}/unidata-gen.elc - -## Depend on .el rather than .elc so as not to needlessly rebuild -## uni-*.el files just because .elc is missing. -## Same for UnicodeData.txt v unidata.txt. -${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt - ${MAKE} compile unidata.txt EMACS="${EMACS}" +${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt | \ + ${srcdir}/unidata-gen.elc unidata.txt -if [ -f "$@" ]; then \ cd ${DSTDIR} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \ fi |