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

diff --git a/ChangeLog b/ChangeLog
index bbf75d952bbbe42812efa3f6e59297f39938bb4d..4de1392f1aad2c7d0053ea86127a8ad87eb633bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-19  Stepan Kasal  <kasal@ucw.cz>
+
+       * Makefile.am (automake, aclocal): Merge the rules.
+
 2005-07-10  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream

diff --git a/Makefile.am b/Makefile.am
index 17b4a4e36bfbe22aa120f54a3f54a979d323d2f4..595dacb1ca99c5c14bb20a4b74021bf24014bfa2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,16 +77,11 @@ do_subst = sed \
 ## 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 $@ $@.tmp
-       $(do_subst) $(srcdir)/automake.in >$@.tmp
-       chmod +x $@.tmp
-       chmod a-w $@.tmp
-       mv -f $@.tmp $@
-
-aclocal: aclocal.in Makefile
-       rm -f $@ $@.tmp
-       $(do_subst) $(srcdir)/aclocal.in >$@.tmp
+       $(do_subst) $(srcdir)/$@.in >$@.tmp
        chmod +x $@.tmp
        chmod a-w $@.tmp
        mv -f $@.tmp $@

diff --git a/Makefile.in b/Makefile.in
index 9c6be60b1486a96f9f6dc33580b25087c07daa1d..8f223d9260c85cf436c1fa660b442a9303117add 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -660,16 +660,11 @@ uninstall-hook:
          rm -f $(DESTDIR)$(bindir)/$$fv; \
        done
 
-automake: automake.in Makefile
+automake: automake.in
+aclocal: aclocal.in
+automake aclocal: Makefile
        rm -f $@ $@.tmp
-       $(do_subst) $(srcdir)/automake.in >$@.tmp
-       chmod +x $@.tmp
-       chmod a-w $@.tmp
-       mv -f $@.tmp $@
-
-aclocal: aclocal.in Makefile
-       rm -f $@ $@.tmp
-       $(do_subst) $(srcdir)/aclocal.in >$@.tmp
+       $(do_subst) $(srcdir)/$@.in >$@.tmp
        chmod +x $@.tmp
        chmod a-w $@.tmp
        mv -f $@.tmp $@