* Makefile.am (maintainer-check): Scan all *.am files and tests

for invocations of `rm' without `-f'.
* tests/mclean.test: Adjusted to prevent triggering the above
test.

diff --git a/ChangeLog b/ChangeLog
index 6b0d621..5578e7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-09  Pavel Roskin  <proski@gnu.org>
+
+       * Makefile.am (maintainer-check): Scan all *.am files and tests
+       for invocations of `rm' without `-f'.
+       * tests/mclean.test: Adjusted to prevent triggering the above
+       test.
+
 2001-03-09  Tom Tromey  <tromey@redhat.com>
 
        * automake.in (scan_one_autoconf_file): Fixed comment to avoid

diff --git a/Makefile.am b/Makefile.am
index 41fdb6f..8da2d3d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,6 +79,13 @@ maintainer-check: automake aclocal
          echo "Found too many uses of '\$${' in the lines above." 1>&2; \
          exit 1;                               \
        else :; fi
+## Make sure `rm' is called with `-f'.
+       @if egrep '\<rm ([^-]|\-[^f ]*\>)' \
+                 $(srcdir)/[a-z]*.am $(srcdir)/tests/*.test | \
+             fgrep -v '##'; then \
+         echo "Suspicious 'rm' invocation." 1>&2; \
+         exit 1;                               \
+       else :; fi
 ## Make sure all invocations of mkinstalldirs are correct.
        @if fgrep -n 'mkinstalldirs' $(srcdir)/[a-z]*.am | \
              fgrep -v '$$(mkinstalldirs)'; then \

diff --git a/Makefile.in b/Makefile.in
index 524c40a..85ce15a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -628,6 +628,12 @@ maintainer-check: automake aclocal
          echo "Found too many uses of '\$${' in the lines above." 1>&2; \
          exit 1;                               \
        else :; fi
+       @if egrep '\<rm ([^-]|\-[^f ]*\>)' \
+                 $(srcdir)/[a-z]*.am $(srcdir)/tests/*.test | \
+             fgrep -v '##'; then \
+         echo "Suspicious 'rm' invocation." 1>&2; \
+         exit 1;                               \
+       else :; fi
        @if fgrep -n 'mkinstalldirs' $(srcdir)/[a-z]*.am | \
              fgrep -v '$$(mkinstalldirs)'; then \
          echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 41fdb6f..8da2d3d 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -79,6 +79,13 @@ maintainer-check: automake aclocal
          echo "Found too many uses of '\$${' in the lines above." 1>&2; \
          exit 1;                               \
        else :; fi
+## Make sure `rm' is called with `-f'.
+       @if egrep '\<rm ([^-]|\-[^f ]*\>)' \
+                 $(srcdir)/[a-z]*.am $(srcdir)/tests/*.test | \
+             fgrep -v '##'; then \
+         echo "Suspicious 'rm' invocation." 1>&2; \
+         exit 1;                               \
+       else :; fi
 ## Make sure all invocations of mkinstalldirs are correct.
        @if fgrep -n 'mkinstalldirs' $(srcdir)/[a-z]*.am | \
              fgrep -v '$$(mkinstalldirs)'; then \