From 63ce7380067074f1468691283933819f27d89dd4 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 6 Feb 2001 09:08:55 +0000 Subject: [PATCH] * automake.in (do_one_clean_target): Don't hard code knowledge about libtool, and maintainer-clean. * clean.am, libtool.am: Handle these. --- ChangeLog | 7 +++++++ Makefile.in | 4 ++-- automake.in | 14 -------------- clean.am | 6 +++++- lib/am/clean.am | 6 +++++- lib/am/libtool.am | 1 + libtool.am | 1 + m4/Makefile.in | 4 ++-- tests/Makefile.in | 4 ++-- 9 files changed, 25 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9a815a7..556f817f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-02-06 Akim Demaille + + * automake.in (do_one_clean_target): Don't hard code knowledge + about libtool, and maintainer-clean. + * clean.am, libtool.am: Handle these. + + 2001-02-05 Akim Demaille * automake.in (handle_texinfo): No longer hard code the clean diff --git a/Makefile.in b/Makefile.in index 8c4530b9..b51eef7f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -576,6 +576,8 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* 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 mostlyclean-am: mostlyclean-vti mostlyclean-aminfo mostlyclean-tags \ mostlyclean-generic @@ -596,8 +598,6 @@ distclean: distclean-recursive maintainer-clean-am: maintainer-clean-vti maintainer-clean-aminfo \ maintainer-clean-tags maintainer-clean-generic \ distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive -rm -f config.status diff --git a/automake.in b/automake.in index 40a4606f..5083ffa6 100755 --- a/automake.in +++ b/automake.in @@ -3975,20 +3975,6 @@ sub do_one_clean_target # Print the target and the dependencies. &pretty_print_rule ($name . 'clean-am: ', "\t\t", @deps); - # FIXME: shouldn't we really print these messages before running - # the dependencies? - if ($name eq 'maintainer-') - { - # Print a special warning. - $output_rules .= - ("\t\@echo \"This command is intended for maintainers to use;\"\n" - . "\t\@echo \"it deletes files that may require special " - . "tools to rebuild.\"\n"); - } - elsif ($name eq 'dist') - { - $output_rules .= "\t-rm -f libtool\n" if $seen_libtool; - } $output_rules .= "\n"; # Now generate the actual clean target. diff --git a/clean.am b/clean.am index 2e84bc57..cfaa1d28 100644 --- a/clean.am +++ b/clean.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright 1994, 1995, 1996, 1998, 1999 Free Software Foundation, Inc. +## Copyright 1994, 1995, 1996, 1998, 1999, 2001 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -31,5 +31,9 @@ distclean-generic: DISTCLEAN -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: +## FIXME: shouldn't we really print these messages before running +## 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 MAINTAINERCLEAN -test -z "@MCFILES@" || rm -f @MFILES@ diff --git a/lib/am/clean.am b/lib/am/clean.am index 2e84bc57..cfaa1d28 100644 --- a/lib/am/clean.am +++ b/lib/am/clean.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright 1994, 1995, 1996, 1998, 1999 Free Software Foundation, Inc. +## Copyright 1994, 1995, 1996, 1998, 1999, 2001 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -31,5 +31,9 @@ distclean-generic: DISTCLEAN -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: +## FIXME: shouldn't we really print these messages before running +## 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 MAINTAINERCLEAN -test -z "@MCFILES@" || rm -f @MFILES@ diff --git a/lib/am/libtool.am b/lib/am/libtool.am index ea17dfaa..1a2f8348 100644 --- a/lib/am/libtool.am +++ b/lib/am/libtool.am @@ -23,5 +23,6 @@ clean-libtool: -rm -rf .libs _libs distclean-libtool: + -rm -f libtool maintainer-clean-libtool: diff --git a/libtool.am b/libtool.am index ea17dfaa..1a2f8348 100644 --- a/libtool.am +++ b/libtool.am @@ -23,5 +23,6 @@ clean-libtool: -rm -rf .libs _libs distclean-libtool: + -rm -f libtool maintainer-clean-libtool: diff --git a/m4/Makefile.in b/m4/Makefile.in index bad2e3d8..4be2fdc3 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -175,6 +175,8 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* 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 mostlyclean-am: mostlyclean-generic @@ -189,8 +191,6 @@ distclean-am: distclean-generic clean-am distclean: distclean-am maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am diff --git a/tests/Makefile.in b/tests/Makefile.in index 79c7f129..0e8d3bb3 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -470,6 +470,8 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* 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 mostlyclean-am: mostlyclean-generic @@ -484,8 +486,6 @@ distclean-am: distclean-generic clean-am distclean-local distclean: distclean-am maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am -- 2.43.5