* tests/Makefile.am (TESTS): Removed maintclean.test.

	* lib/am/clean.am (maintainer-clean-generic): Don't remove
	Makefile.in.
	* lib/am/configure.am (maintainer-clean-am): Removed.
	(maintainer-clean-conf): Removed.
	* tests/maintclean.test: Removed.

diff --git a/ChangeLog b/ChangeLog
index 6b4917793476d5cad8c1848d97b222faa5df29d5..74a0445cf84e10d0c2e3ff5ab794831a64fd6bee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-05-16  Tom Tromey  <tromey@redhat.com>
+
+       * tests/Makefile.am (TESTS): Removed maintclean.test.
+       * lib/am/clean.am (maintainer-clean-generic): Don't remove
+       Makefile.in.
+       * lib/am/configure.am (maintainer-clean-am): Removed.
+       (maintainer-clean-conf): Removed.
+       * tests/maintclean.test: Removed.
+
 2001-05-15  Tom Tromey  <tromey@redhat.com>
 
        Fix for PR automake/177:

diff --git a/lib/am/clean.am b/lib/am/clean.am
index 74fd23ecbcde1d2781cb9139857155e80163e245..7d40c68b08b89dc3d8dd571a262be012eb06bfdb 100644 (file)
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -38,7 +38,6 @@ maintainer-clean-generic:
 ## the dependencies?
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-       -rm -f Makefile.in
 ?MFILES?       -test -z "%MCFILES%" || rm -f %MFILES%
 
 .PHONY: clean mostlyclean distclean maintainer-clean \

diff --git a/lib/am/configure.am b/lib/am/configure.am
index 6e93de86e85a25acb0508787427107816ffa28e0..d33d4f0c276c84e7a33def86d860c0a3b47ce127 100644 (file)
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -82,14 +82,7 @@ if %?TOPDIR_P%
 distclean:
        -rm -f config.status config.cache config.log
 
-maintainer-clean-am: maintainer-clean-conf
-
-if %?REGEN-ACLOCAL-M4%
-maintainer-clean-conf:
-       -rm -f configure aclocal.m4
-else ! %?REGEN-ACLOCAL-M4%
-maintainer-clean-conf:
-       -rm -f configure
-endif ! %?REGEN-ACLOCAL-M4%
-
+## Note: you might think we should remove Makefile.in, configure, or
+## aclocal.m4 here in a maintainer-clean rule.  However, the GNU
+## Coding Standards explicitly prohibit this.
 endif %?TOPDIR_P%

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 06ebabf30947bd07ace449f865b0887355891c54..2232fcbffd1cb06450137f329684b57c3e834a76 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -173,7 +173,6 @@ link_f_cxx.test     \
 link_f_only.test \
 lisp.test \
 ltlibobjs.test \
-maintclean.test \
 make.test \
 makevars.test \
 man.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 2c49bd5a75d816ce4cf7518ba81261794a083100..96a208700bb8705faaa2d884e99fd93902f16524 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -241,7 +241,6 @@ link_f_cxx.test     \
 link_f_only.test \
 lisp.test \
 ltlibobjs.test \
-maintclean.test \
 make.test \
 makevars.test \
 man.test \
@@ -492,7 +491,6 @@ distclean-generic:
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-       -rm -f Makefile.in
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am

diff --git a/tests/maintclean.test b/tests/maintclean.test
deleted file mode 100755 (executable)
index 3327dc2..0000000
--- a/tests/maintclean.test
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-
-# Make sure that `maintainer-clean' removes Makefile.in, configure,
-# and aclocal.m4.
-
-. $srcdir/defs || exit 1
-
-cat > configure.in << 'END'
-AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(foo,0,no)
-AM_MAKE_INCLUDE
-AC_OUTPUT(Makefile)
-END
-
-: > Makefile.am
-
-$needs_autoconf
-
-set -e
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE
-
-export ACLOCAL
-export AUTOCONF
-export AUTOMAKE
-
-./configure
-
-$MAKE maintainer-clean
-
-test -f Makefile.in && exit 1
-test -f configure && exit 1
-test -f aclocal.m4 && exit 1
-
-exit 0