2005-07-18  Stepan Kasal  <address@hidden>

	* Makefile.am (automake, aclocal): Merge the rules.

Index: Makefile.am
===================================================================
RCS file: /cvs/automake/automake/Makefile.am,v
retrieving revision 1.239
diff -u -r1.239 Makefile.am
--- Makefile.am	14 May 2005 20:28:50 -0000	1.239
+++ Makefile.am	18 Jul 2005 17:39:44 -0000
@@ -77,16 +77,11 @@
 ## These files depend on Makefile so they are rebuilt if $(VERSION),
 ## $(datadir) or other do_subst'ituted variables change.
 ## Use chmod a-w to prevent people from editing the wrong file by accident.
-automake: automake.in Makefile
+automake: automake.in
+aclocal: aclocal.in
+automake aclocal: Makefile
 	rm -f $@ address@hidden
-	$(do_subst) $(srcdir)/automake.in >address@hidden
-	chmod +x address@hidden
-	chmod a-w address@hidden
-	mv -f address@hidden $@
-
-aclocal: aclocal.in Makefile
-	rm -f $@ address@hidden
-	$(do_subst) $(srcdir)/aclocal.in >address@hidden
+	$(do_subst) $(srcdir)/address@hidden >address@hidden
 	chmod +x address@hidden
 	chmod a-w address@hidden
 	mv -f address@hidden $@