diff options
author | Tom Tromey <tromey@redhat.com> | 2001-05-17 03:02:38 +0000 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2001-05-17 03:02:38 +0000 |
commit | 0d43099b0ed164d54a49e77aa8ffb671f3b3041c (patch) | |
tree | 345a58345eeb2dad64d0d757b1c19b9558ebb08d | |
parent | 9449973a13c0b616d03a19699f13f535ffc7895c (diff) | |
download | automake-0d43099b0ed164d54a49e77aa8ffb671f3b3041c.tar.gz |
* 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.
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | lib/am/clean.am | 1 | ||||
-rw-r--r-- | lib/am/configure.am | 13 | ||||
-rw-r--r-- | tests/Makefile.am | 1 | ||||
-rw-r--r-- | tests/Makefile.in | 2 | ||||
-rwxr-xr-x | tests/maintclean.test | 37 |
6 files changed, 12 insertions, 51 deletions
@@ -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 74fd23ecb..7d40c68b0 100644 --- 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 6e93de86e..d33d4f0c2 100644 --- 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 06ebabf30..2232fcbff 100644 --- 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 2c49bd5a7..96a208700 100644 --- 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 index 3327dc2ba..000000000 --- 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 |