admin/grammars: Use pattern rules in Makefile

* admin/grammars/Makefile.in (${bovinedir}/c-by.el, ${bovinedir}/make-by.el):
(${wisentdir}/js-wy.el, ${wisentdir}/python-wy.el): Replace with pattern rules.
(${bovinedir}/scm-by.el, ${wisentdir}/javat-wy.el)
(${cedetdir}/srecode/srt-wy.el): Use $<.

2 files changed, 19 insertions, 20 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index d53049f95c..0a91217d08 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,5 +1,11 @@
 2014-06-25  Glenn Morris  <[email protected]>
 
+	* grammars/Makefile.in (${bovinedir}/c-by.el, ${bovinedir}/make-by.el):
+	(${wisentdir}/js-wy.el, ${wisentdir}/python-wy.el):
+	Replace with pattern rules.
+	(${bovinedir}/scm-by.el, ${wisentdir}/javat-wy.el)
+	(${cedetdir}/srecode/srt-wy.el): Use $<.
+
 	* unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Make and load .elc.
 	(.el.elc): Replace with pattern rule.
 	(%.elc): New.
diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in
index b89df7116a..1454225b80 100644
--- a/admin/grammars/Makefile.in
+++ b/admin/grammars/Makefile.in
@@ -66,39 +66,32 @@ bovine: ${BOVINE}
 
 wisent: ${WISENT}
 
-
-${bovinedir}/c-by.el: ${srcdir}/c.by
-	[ ! -f "$@" ] || chmod +w "$@"
-	${make_bovine} -o "$@" ${srcdir}/c.by
-
-${bovinedir}/make-by.el: ${srcdir}/make.by
+## c-by.el, make-by.el.
+${bovinedir}/%-by.el: ${srcdir}/%.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