This is the mail archive of the
automake@gnu.org
mailing list for the automake project.
24-clean-do-clean.patch
- To: Automake <automake at gnu dot org>
- Subject: 24-clean-do-clean.patch
- From: Akim Demaille <akim at epita dot fr>
- Date: Sun, 04 Feb 2001 14:38:15 +0100
- List-Id: Discussion list for automake <automake.gnu.org><mailto:automake-request@gnu.org?subject=unsubscribe>
Index: ChangeLog
from Akim Demaille <akim@epita.fr>
* automake.in (do_one_clean_target): Don't hard code knowledge
about libtool, and maintainer-clean.
* clean.am, libtool.am: Handle these.
Index: automake.in
--- automake.in Sun, 04 Feb 2001 00:49:46 +0100 akim (am/f/39_automake.i 1.30 755)
+++ automake.in Sun, 04 Feb 2001 01:10:37 +0100 akim (am/f/39_automake.i 1.30 755)
@@ -3961,20 +3961,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.
Index: libtool.am
--- libtool.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/31_libtool.am 1.1 644)
+++ libtool.am Sun, 04 Feb 2001 01:11:05 +0100 akim (am/g/31_libtool.am 1.1 644)
@@ -23,5 +23,6 @@
-rm -rf .libs _libs
distclean-libtool:
+ -rm -f libtool
maintainer-clean-libtool:
Index: clean.am
--- clean.am Sat, 13 Jan 2001 18:11:09 +0100 akim (am/g/50_clean.am 1.1 644)
+++ clean.am Sun, 04 Feb 2001 01:11:58 +0100 akim (am/g/50_clean.am 1.1 644)
@@ -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 -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@
Index: tests/Makefile.in
--- tests/Makefile.in Fri, 02 Feb 2001 07:28:15 +0100 akim (am/h/14_Makefile.i 1.5 644)
+++ tests/Makefile.in Sun, 04 Feb 2001 01:12:11 +0100 akim (am/h/14_Makefile.i 1.5 644)
@@ -469,6 +469,8 @@
-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
@@ -483,8 +485,6 @@
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
Index: m4/Makefile.in
--- m4/Makefile.in Fri, 02 Feb 2001 07:28:15 +0100 akim (am/h/15_Makefile.i 1.5 644)
+++ m4/Makefile.in Sun, 04 Feb 2001 01:12:11 +0100 akim (am/h/15_Makefile.i 1.5 644)
@@ -174,6 +174,8 @@
-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
@@ -188,8 +190,6 @@
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
Index: Makefile.in
--- Makefile.in Sun, 04 Feb 2001 00:49:46 +0100 akim (am/h/16_Makefile.i 1.5 644)
+++ Makefile.in Sun, 04 Feb 2001 01:12:11 +0100 akim (am/h/16_Makefile.i 1.5 644)
@@ -574,6 +574,8 @@
-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
@@ -594,8 +596,6 @@
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