2012-09-09  Paul Smith  <psmith@gnu.org>

	* remake.c (update_file_1): Force intermediate files to be

	considered, not pruned, if their non-intermediate parent needs to

	be remade.  Fixes Savannah bug #30653.

--- a/remake.c

+++ b/remake.c

@@ -612,6 +612,10 @@ update_file_1 (struct file *file, unsigned int depth)

                 d->file->dontcare = file->dontcare;

               }

+            /* We may have already considered this file, when we didn't know

+               we'd need to update it.  Force update_file() to consider it and

+               not prune it.  */

+            d->file->considered = !considered;

 	    dep_status |= update_file (d->file, depth);

--- a/tests/scripts/features/parallelism

+++ b/tests/scripts/features/parallelism

@@ -214,6 +214,23 @@ rm main.x");

     rmfiles(qw(foo.y foo.y.in main.bar));

 }

+# Ensure intermediate/secondary files are not pruned incorrectly.

+# See Savannah bug #30653

+

+utouch(-15, 'file2');

+utouch(-10, 'file4');

+utouch(-5,  'file1');

+

+run_make_test(q!

+.INTERMEDIATE: file3

+file4: file3 ; @mv -f $< $@

+file3: file2 ; touch $@

+file2: file1 ; @touch $@

+!,

+              '--no-print-directory -j2', "touch file3");

+

+#rmfiles('file1', 'file2', 'file3', 'file4');

+

 if ($all_tests) {

     # Jobserver FD handling is messed up in some way.

     # Savannah bug #28189