diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-10-22 07:05:43 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-10-22 07:05:43 +0000 |
commit | f0cab81cded2954bc9700c5319371d98fbcacc37 (patch) | |
tree | ae7cc002b2d1fe9f80d2922563bcbf8281ab4021 /dmake | |
parent | 3631107bbc5985ad4f1c0d1fd88642cf4de34b42 (diff) |
INTEGRATION: CWS dmake43 (1.5.28); FILE MERGED
2004/10/07 22:18:47 vq 1.5.28.1: #i34746# Fix timestamp of phony targets with prerequisites.
Diffstat (limited to 'dmake')
-rw-r--r-- | dmake/sysintf.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/dmake/sysintf.c b/dmake/sysintf.c index a7284ee2cf81..0d429d622da8 100644 --- a/dmake/sysintf.c +++ b/dmake/sysintf.c @@ -1,4 +1,4 @@ -/* RCS $Id: sysintf.c,v 1.5 2003-12-17 16:01:35 vg Exp $ +/* RCS $Id: sysintf.c,v 1.6 2004-10-22 08:05:43 rt Exp $ -- -- SYNOPSIS -- System independent interface @@ -708,15 +708,9 @@ CELLPTR cp; time_t phonytime = (time_t)0L; int phony = ((cp->ce_attr&A_PHONY) != 0); - /* Compute phony time as either the current time, or the most recent time - * from the list of prerequisites if there are any. */ - if ( cp->ce_prq != NIL(LINK) ) { - for(dp=cp->ce_prq; dp; dp=dp->cl_next) - if ( dp->cl_prq->ce_time > phonytime ) - phonytime = dp->cl_prq->ce_time; - } - else - phonytime = Do_time(); + /* Use the current time as phony timestamp for phony targets. */ + /* This was changed with issue 34746. */ + phonytime = Do_time(); for(dp=CeMeToo(cp); dp; dp=dp->cl_next) { tcp=dp->cl_prq; |