diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | lib/am/clean.am | 15 | ||||
| -rw-r--r-- | lib/am/configure.am | 27 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.in | 5 |
5 files changed, 42 insertions, 18 deletions
@@ -1,5 +1,16 @@ 2001-05-15 Tom Tromey <tromey@redhat.com> + Fix for maintclean.test: + * tests/Makefile.am (XFAIL_TESTS): Removed maintclean.test. + * lib/am/clean.am (distclean-generic): Don't remove config.cache + or config.log. + (distclean, maintainer-clean): Moved to... + * lib/am/configure.am: ... here. + (distclean): Remove config.cache and config.log. + (maintainer-clean): Removed. + (maintainer-clean-conf): New target. + (maintainer-clean-am): New target. + * tests/Makefile.am (TESTS): Added maintclean.test. (XFAIL_TESTS): Likewise. * tests/maintclean.test: New file. diff --git a/lib/am/clean.am b/lib/am/clean.am index 7e4b4161e..74fd23ecb 100644 --- a/lib/am/clean.am +++ b/lib/am/clean.am @@ -29,8 +29,7 @@ clean-generic: distclean-am: distclean-generic clean-am distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* ?DISTCLEAN? -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-am: maintainer-clean-generic distclean-am @@ -49,15 +48,3 @@ clean-generic mostlyclean-generic distclean-generic maintainer-clean-generic ?!SUBDIRS?distclean: distclean-am ?!SUBDIRS?mostlyclean: mostlyclean-am ?!SUBDIRS?maintainer-clean: maintainer-clean-am - -## We special-case config.status here. If we do it as part of the -## normal clean processing for this directory, then it might be -## removed before some subdir is cleaned. However, that subdir's -## Makefile depends on config.status. - -if %?TOPDIR_P% -distclean: - -rm -f config.status -maintainer-clean: - -rm -f config.status -endif %?TOPDIR_P% diff --git a/lib/am/configure.am b/lib/am/configure.am index bbae72c33..6e93de86e 100644 --- a/lib/am/configure.am +++ b/lib/am/configure.am @@ -66,3 +66,30 @@ $(ACLOCAL_M4): %MAINTAINER-MODE% %CONFIGURE-AC% %ACLOCAL_M4_DEPS% cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) endif %?REGEN-ACLOCAL-M4% endif %?TOPDIR_P% + + +## --------- ## +## cleanup. ## +## --------- ## + + +## We special-case config.status here. If we do it as part of the +## normal clean processing for this directory, then it might be +## removed before some subdir is cleaned. However, that subdir's +## Makefile depends on config.status. + +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% + +endif %?TOPDIR_P% diff --git a/tests/Makefile.am b/tests/Makefile.am index 2489e022c..06ebabf30 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = gnits -XFAIL_TESTS = subdir5.test maintclean.test +XFAIL_TESTS = subdir5.test TESTS = \ acinclude.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index d9f33b1a1..2c49bd5a7 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -70,7 +70,7 @@ install_sh = @install_sh@ AUTOMAKE_OPTIONS = gnits -XFAIL_TESTS = subdir5.test maintclean.test +XFAIL_TESTS = subdir5.test TESTS = \ acinclude.test \ @@ -487,8 +487,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" |