From b095e5961639f1cb32e9b32805f724fdc6870390 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 28 Mar 1997 00:52:17 +0000 Subject: [PATCH] silence stamp-creation rules --- ChangeLog | 4 ++++ Makefile.am | 5 ----- Makefile.in | 4 ---- lib/am/Makefile.am | 5 ----- lib/am/texi-vers.am | 13 +++++++------ texi-vers.am | 13 +++++++------ 6 files changed, 18 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7691a552..b780cdb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ Thu Mar 27 17:28:47 1997 Tom Tromey + * texi-vers.am (stamp-@VTI@): Make commands silent. + + * Makefile.am (maintainer-check): "true" is ok now. + * m4/init.m4: Added optional 3rd argument, which avoids AC_DEFINE. diff --git a/Makefile.am b/Makefile.am index 3f73a237..27af5e55 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,11 +54,6 @@ maintainer-check: automake aclocal ## Syntax check with default Perl (on my machine, Perl 5). $(PERL) -c -w automake $(PERL) -c -w aclocal -## Ensure `true' is never used; I've accidentally used it before. - @if grep '^[^#].*true' $(srcdir)/[a-z]*.am; then \ - echo "can't use 'true' in GNU Makefile" 1>&2; \ - exit 1; \ - else :; fi ## expect no instances of '${...}'. However, $${...} is ok, since that ## is a shell construct, not a Makefile construct. @if test `fgrep '$${' $(srcdir)/[a-z]*.am | fgrep -v '$$$$' | wc -l` -ne 0; then \ diff --git a/Makefile.in b/Makefile.in index a0d34ee4..5732285e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -493,10 +493,6 @@ perl4-check: automake aclocal maintainer-check: automake aclocal $(PERL) -c -w automake $(PERL) -c -w aclocal - @if grep '^[^#].*true' $(srcdir)/[a-z]*.am; then \ - echo "can't use 'true' in GNU Makefile" 1>&2; \ - exit 1; \ - else :; fi @if test `fgrep '$${' $(srcdir)/[a-z]*.am | fgrep -v '$$$$' | wc -l` -ne 0; then \ echo "found too many uses of '\$${'" 1>&2; \ exit 1; \ diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am index 3f73a237..27af5e55 100644 --- a/lib/am/Makefile.am +++ b/lib/am/Makefile.am @@ -54,11 +54,6 @@ maintainer-check: automake aclocal ## Syntax check with default Perl (on my machine, Perl 5). $(PERL) -c -w automake $(PERL) -c -w aclocal -## Ensure `true' is never used; I've accidentally used it before. - @if grep '^[^#].*true' $(srcdir)/[a-z]*.am; then \ - echo "can't use 'true' in GNU Makefile" 1>&2; \ - exit 1; \ - else :; fi ## expect no instances of '${...}'. However, $${...} is ok, since that ## is a shell construct, not a Makefile construct. @if test `fgrep '$${' $(srcdir)/[a-z]*.am | fgrep -v '$$$$' | wc -l` -ne 0; then \ diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am index b617402b..6f0c18ef 100644 --- a/lib/am/texi-vers.am +++ b/lib/am/texi-vers.am @@ -21,16 +21,17 @@ ## Depend on configure.in so that version number updates cause a ## rebuild. stamp-@VTI@: @TEXI@ $(top_srcdir)/configure.in - echo "@set UPDATED `cd $(srcdir) \ + @echo "@set UPDATED `cd $(srcdir) \ && $(SHELL) @MDDIR@/mdate-sh @TEXI@`" > @VTI@.tmp - echo "@set EDITION $(VERSION)" >> @VTI@.tmp - echo "@set VERSION $(VERSION)" >> @VTI@.tmp + @echo "@set EDITION $(VERSION)" >> @VTI@.tmp + @echo "@set VERSION $(VERSION)" >> @VTI@.tmp ## Use cp and rm here because some older "mv"s can't move across ## filesystems. Furthermore, GNU "mv" in the AmigaDOS environment ## can't handle this. - cmp -s @VTI@.tmp $(srcdir)/stamp-@VTI@ \ - || cp @VTI@.tmp $(srcdir)/stamp-@VTI@ - rm -f @VTI@.tmp + @cmp -s @VTI@.tmp $(srcdir)/stamp-@VTI@ + || (echo "Updating $(srcdir)/stamp-@VTI@"; \ + cp @VTI@.tmp $(srcdir)/stamp-@VTI@) + @rm -f @VTI@.tmp mostlyclean-@VTI@: rm -f @VTI@.tmp diff --git a/texi-vers.am b/texi-vers.am index f820131c..6f0c18ef 100644 --- a/texi-vers.am +++ b/texi-vers.am @@ -21,16 +21,17 @@ ## Depend on configure.in so that version number updates cause a ## rebuild. stamp-@VTI@: @TEXI@ $(top_srcdir)/configure.in - echo "@set UPDATED `cd $(srcdir) \ + @echo "@set UPDATED `cd $(srcdir) \ && $(SHELL) @MDDIR@/mdate-sh @TEXI@`" > @VTI@.tmp - echo "@set EDITION $(VERSION)" >> @VTI@.tmp - echo "@set VERSION $(VERSION)" >> @VTI@.tmp + @echo "@set EDITION $(VERSION)" >> @VTI@.tmp + @echo "@set VERSION $(VERSION)" >> @VTI@.tmp ## Use cp and rm here because some older "mv"s can't move across ## filesystems. Furthermore, GNU "mv" in the AmigaDOS environment ## can't handle this. - cmp -s @VTI@.tmp $(srcdir)/@VTEXI@ \ - || cp @VTI@.tmp $(srcdir)/stamp-@VTI@ - rm -f @VTI@.tmp + @cmp -s @VTI@.tmp $(srcdir)/stamp-@VTI@ + || (echo "Updating $(srcdir)/stamp-@VTI@"; \ + cp @VTI@.tmp $(srcdir)/stamp-@VTI@) + @rm -f @VTI@.tmp mostlyclean-@VTI@: rm -f @VTI@.tmp -- 2.43.5