* subdirs.am: This file is the exception: clean recursive targets

are called by the clean targets, not the clean-am targets.
Otherwise we have a circular dependency: clean -> clean-am ->
clean-recursive -> clean.
* automake.in (handle_clean): Bind `-local' targets to `-am'
targets, not top targets.
Don't declare -recursive dependencies of the clean targets:
`subdirs.am' did it.  Less hard coded knowledge, transfered
into...
* clean.am: here.

diff --git a/ChangeLog b/ChangeLog
index 10183982e5aa289a458344d794a9dc5d01ee0c17..83fbf5b0564930f41277cda74d7c46e0b4b8e188 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2001-02-06  Akim Demaille  <akim@epita.fr>
+
+       * subdirs.am: This file is the exception: clean recursive targets
+       are called by the clean targets, not the clean-am targets.
+       Otherwise we have a circular dependency: clean -> clean-am ->
+       clean-recursive -> clean.
+       * automake.in (handle_clean): Bind `-local' targets to `-am'
+       targets, not top targets.
+       Don't declare -recursive dependencies of the clean targets:
+       `subdirs.am' did it.  Less hard coded knowledge, transfered
+       into...
+       * clean.am: here.
+
 2001-02-06  Akim Demaille  <akim@epita.fr>
 
        Monstro unsplitable patch.
@@ -55,7 +68,7 @@
        about libtool, and maintainer-clean.
        * clean.am, libtool.am: Handle these.
 
-       
+
 2001-02-05  Akim Demaille  <akim@epita.fr>
 
        * automake.in (handle_texinfo): No longer hard code the clean

diff --git a/Makefile.in b/Makefile.in
index 41ae901b6b1f8ebc509cdc1f73c7933f82d59d1b..49a833dcdb2309e05649069acdde05a0e4809b0e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -574,25 +574,22 @@ maintainer-clean-generic:
        -rm -f Makefile.in
 clean: clean-recursive
 
-clean-am: clean-generic clean-recursive mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
        -rm -f config.status
 
-distclean-am: clean-am distclean-generic distclean-recursive \
-       distclean-tags
+distclean-am: clean-am distclean-generic distclean-tags
 
 maintainer-clean: maintainer-clean-recursive
        -rm -f config.status
 
 maintainer-clean-am: distclean-am maintainer-clean-aminfo \
-       maintainer-clean-generic maintainer-clean-recursive \
-       maintainer-clean-vti
+       maintainer-clean-generic maintainer-clean-vti
 
 mostlyclean: mostlyclean-recursive
 
-mostlyclean-am: mostlyclean-aminfo mostlyclean-generic \
-       mostlyclean-recursive mostlyclean-vti
+mostlyclean-am: mostlyclean-aminfo mostlyclean-generic mostlyclean-vti
 
 .PHONY: all all-am all-recursive all-redirect check check-am \
        check-recursive clean clean-generic clean-recursive distclean \

diff --git a/automake.in b/automake.in
index 7f05dbc01943e4aa2eff1a6f8f5b111a07d38841..9bc7f9f4a7103c2f05881fccdfe60f7af369e2c1 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3910,18 +3910,21 @@ sub handle_clean
                   . 's,\@MFILES\@,' . join (' ', @maintainer_clean_files)
                   . ',;');
     }
+    if ($recursive_install)
+    {
+       $xform .= 's/^NSUBDIRS.*$//;';
+    }
+    else
+    {
+       $xform .= 's/^NSUBDIRS//;';
+    }
 
     $output_rules .= &file_contents ('clean', $xform);
-    &depend ('clean-am', 'mostlyclean-am');
-    &depend ('distclean-am', 'clean-am');
-    &depend ('maintainer-clean-am', 'distclean-am');
 
     foreach ('clean', 'distclean', 'mostlyclean', 'maintainer-clean')
       {
-       &depend ($_, $_ . '-local')
-         if &target_defined ($_ . '-local');
-       &depend ($_,
-                $_ . ($recursive_install ? '-recursive' : '-am'));
+       &depend ("$_-am", "$_-local")
+         if &target_defined ("$_-local");
       }
 
     # We special-case config.status here.  If we do it as part of the

diff --git a/clean.am b/clean.am
index fcdd10c3fd4ede46b6b9f1446c53c4ba51867950..d15edc8e25cb7c41b2913f9883692db401e8d1de 100644 (file)
--- a/clean.am
+++ b/clean.am
@@ -23,17 +23,17 @@ mostlyclean-am: mostlyclean-generic
 mostlyclean-generic:
 MOSTLYCLEAN    -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
-clean-am: clean-generic
+clean-am: clean-generic mostlyclean-am
 clean-generic:
 CLEAN  -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
-distclean-am: distclean-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]*
 DISTCLEAN      -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
-maintainer-clean-am: maintainer-clean-generic
+maintainer-clean-am: maintainer-clean-generic distclean-am
 maintainer-clean-generic:
 ## FIXME: shouldn't we really print these messages before running
 ## the dependencies?
@@ -44,3 +44,8 @@ MAINTAINERCLEAN       -test -z "@MCFILES@" || rm -f @MFILES@
 
 .PHONY: clean mostlyclean distclean maintainer-clean \
 clean-generic mostlyclean-generic distclean-generic maintainer-clean-generic
+
+NSUBDIRSclean: clean-am
+NSUBDIRSdistclean: distclean-am
+NSUBDIRSmostlyclean: mostlyclean-am
+NSUBDIRSmaintainer-clean: maintainer-clean-am

diff --git a/lib/am/clean.am b/lib/am/clean.am
index fcdd10c3fd4ede46b6b9f1446c53c4ba51867950..d15edc8e25cb7c41b2913f9883692db401e8d1de 100644 (file)
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -23,17 +23,17 @@ mostlyclean-am: mostlyclean-generic
 mostlyclean-generic:
 MOSTLYCLEAN    -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
-clean-am: clean-generic
+clean-am: clean-generic mostlyclean-am
 clean-generic:
 CLEAN  -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
-distclean-am: distclean-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]*
 DISTCLEAN      -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
-maintainer-clean-am: maintainer-clean-generic
+maintainer-clean-am: maintainer-clean-generic distclean-am
 maintainer-clean-generic:
 ## FIXME: shouldn't we really print these messages before running
 ## the dependencies?
@@ -44,3 +44,8 @@ MAINTAINERCLEAN       -test -z "@MCFILES@" || rm -f @MFILES@
 
 .PHONY: clean mostlyclean distclean maintainer-clean \
 clean-generic mostlyclean-generic distclean-generic maintainer-clean-generic
+
+NSUBDIRSclean: clean-am
+NSUBDIRSdistclean: distclean-am
+NSUBDIRSmostlyclean: mostlyclean-am
+NSUBDIRSmaintainer-clean: maintainer-clean-am

diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index da1dcba54634ace10ebd970747c5998a61745c91..0c0b0affc38b77f77ac812317478b8ff6b65b585 100644 (file)
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -52,10 +52,10 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
        fi; test -z "$$fail"
 
 
-mostlyclean-am: mostlyclean-recursive
-clean-am: clean-recursive
-distclean-am: distclean-recursive
-maintainer-clean-am: maintainer-clean-recursive
+mostlyclean: mostlyclean-recursive
+clean: clean-recursive
+distclean: distclean-recursive
+maintainer-clean: maintainer-clean-recursive
 
 .PHONY: mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive

diff --git a/subdirs.am b/subdirs.am
index da1dcba54634ace10ebd970747c5998a61745c91..0c0b0affc38b77f77ac812317478b8ff6b65b585 100644 (file)
--- a/subdirs.am
+++ b/subdirs.am
@@ -52,10 +52,10 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
        fi; test -z "$$fail"
 
 
-mostlyclean-am: mostlyclean-recursive
-clean-am: clean-recursive
-distclean-am: distclean-recursive
-maintainer-clean-am: maintainer-clean-recursive
+mostlyclean: mostlyclean-recursive
+clean: clean-recursive
+distclean: distclean-recursive
+maintainer-clean: maintainer-clean-recursive
 
 .PHONY: mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive