Merge from emacs-24; up to 2014-07-27T01:00:26Z!fgallina@gnu.org

[gnu-emacs] / admin / grammars / Makefile.in

diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in
index 827240a8d4ea94864d93b85886999420bf33b41f..c3ee2ef951f9fd446f9fc13a41db3f0b730abbbd 100644 (file)
--- a/admin/grammars/Makefile.in
+++ b/admin/grammars/Makefile.in
@@ -28,6 +28,9 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
+# Prevent any settings in the user environment causing problems.
+unexport EMACSDATA EMACSDOC EMACSPATH
+
 EMACS = ${top_builddir}/src/emacs
 emacs = EMACSLOADPATH= "${EMACS}" -batch --no-site-file --no-site-lisp
 
@@ -63,39 +66,32 @@ bovine: ${BOVINE}
 
 wisent: ${WISENT}
 
-
-${bovinedir}/c-by.el: ${srcdir}/c.by
+## c-by.el, make-by.el.
+${bovinedir}/%-by.el: ${srcdir}/%.by
        [ ! -f "$@" ] || chmod +w "$@"
-       ${make_bovine} -o "$@" ${srcdir}/c.by
-
-${bovinedir}/make-by.el: ${srcdir}/make.by
-       [ ! -f "$@" ] || chmod +w "$@"
-       ${make_bovine} -o "$@" ${srcdir}/make.by
+       ${make_bovine} -o "$@" $<
 
 ${bovinedir}/scm-by.el: ${srcdir}/scheme.by
        [ ! -f "$@" ] || chmod +w "$@"
-       ${make_bovine} -o "$@" ${srcdir}/scheme.by
-
-
-${cedetdir}/semantic/grammar-wy.el: ${srcdir}/grammar.wy
-       [ ! -f "$@" ] || chmod +w "$@"
-       ${make_wisent} -o "$@" ${srcdir}/grammar.wy
+       ${make_bovine} -o "$@" $<
 
-${wisentdir}/javat-wy.el: ${srcdir}/java-tags.wy
+## grammar-wy.el
+${cedetdir}/semantic/%-wy.el: ${srcdir}/%.wy
        [ ! -f "$@" ] || chmod +w "$@"
-       ${make_wisent} -o "$@" ${srcdir}/java-tags.wy
+       ${make_wisent} -o "$@" $<
 
-${wisentdir}/js-wy.el: ${srcdir}/js.wy
+## js-wy.el, python-wy.el
+${wisentdir}/%-wy.el: ${srcdir}/%.wy
        [ ! -f "$@" ] || chmod +w "$@"
-       ${make_wisent} -o "$@" ${srcdir}/js.wy
+       ${make_wisent} -o "$@" $<
 
-${wisentdir}/python-wy.el: ${srcdir}/python.wy
+${wisentdir}/javat-wy.el: ${srcdir}/java-tags.wy
        [ ! -f "$@" ] || chmod +w "$@"
-       ${make_wisent} -o "$@" ${srcdir}/python.wy
+       ${make_wisent} -o "$@" $<
 
 ${cedetdir}/srecode/srt-wy.el: ${srcdir}/srecode-template.wy
        [ ! -f "$@" ] || chmod +w "$@"
-       ${make_wisent} -o "$@" ${srcdir}/srecode-template.wy
+       ${make_wisent} -o "$@" $<
 
 
 .PHONY: distclean bootstrap-clean maintainer-clean extraclean
@@ -103,7 +99,10 @@ ${cedetdir}/srecode/srt-wy.el: ${srcdir}/srecode-template.wy
 distclean:
        rm -f Makefile
 
-bootstrap-clean maintainer-clean: distclean
+## Perhaps this should do what extraclean (qv) does.
+bootstrap-clean:
+
+maintainer-clean: distclean
 
 ## We do not normally delete the generated files, even in bootstrap.
 ## Creating them does not take long, so we could easily change this.