diff options
author | Roland McGrath <roland@redhat.com> | 1995-04-26 21:27:19 +0000 |
---|---|---|
committer | Roland McGrath <roland@redhat.com> | 1995-04-26 21:27:19 +0000 |
commit | 81699266d3ddf09af3716dc0625004398e17b274 (patch) | |
tree | b479ff1473fb3b485b18fd4ba538261c1a2ed2d3 | |
parent | cbdb3653da95b07fe269ef8cc166f4d7882717b8 (diff) | |
download | gunmake-81699266d3ddf09af3716dc0625004398e17b274.tar.gz |
(remove_intermediates): Fix inverted test to bail under -n for signal case.
Bail under -q or -t.
Skip files with update_status==-1.
-rw-r--r-- | file.c | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -1,5 +1,5 @@ /* Target file hash table management for GNU Make. -Copyright (C) 1988, 89, 90, 91, 92, 93, 94 Free Software Foundation, Inc. +Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 1995 Free Software Foundation, Inc. This file is part of GNU Make. GNU Make is free software; you can redistribute it and/or modify @@ -294,7 +294,9 @@ remove_intermediates (sig) register struct file *f; char doneany; - if (!sig && just_print_flag) + if (question_flag || touch_flag) + return; + if (sig && just_print_flag) return; doneany = 0; @@ -303,7 +305,11 @@ remove_intermediates (sig) if (f->intermediate && (f->dontcare || !f->precious)) { int status; - if (just_print_flag) + if (f->update_status == -1) + /* If nothing would have created this file yet, + don't print an "rm" command for it. */ + continue; + else if (just_print_flag) status = 0; else { |