github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-01-26 20:30:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor updates for Windows and OS/2.

Browse Source
This commit is contained in:
Paul Smith 2003-07-19 02:46:25 +00:00
parent 1a5beef51f
commit e3986eea43
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-07-18 Paul D. Smith <psmith@gnu.org>
* dir.c (directory_contents_hash_1, directory_contents_hash_1)
[WINDOWS32]: Initialize hash.
2003-04-30 Paul D. Smith <psmith@gnu.org>
* build.template: Make some changes to maybe allow this script to

4
dir.c
View File

@ -1,6 +1,6 @@
/* Directory hashing for GNU Make.
Copyright (C) 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
2002 Free Software Foundation, Inc.
2002,2003 Free Software Foundation, Inc.
This file is part of GNU Make.
GNU Make is free software; you can redistribute it and/or modify
@ -249,6 +249,7 @@ directory_contents_hash_1 (const void *key_0)
unsigned long hash;
#ifdef WINDOWS32
hash = 0;
ISTRING_HASH_1 (key->path_key, hash);
hash ^= ((unsigned int) key->dev << 4) ^ (unsigned int) key->ctime;
#else
@ -271,6 +272,7 @@ directory_contents_hash_2 (const void *key_0)
unsigned long hash;
#ifdef WINDOWS32
hash = 0;
ISTRING_HASH_2 (key->path_key, hash);
hash ^= ((unsigned int) key->dev << 4) ^ (unsigned int) ~key->ctime;
#else

16
doc/make.texi
View File

@ -8,10 +8,10 @@
@c FSF publishers: format makebook.texi instead of using this file directly.
@set RCSID $Id$
@set EDITION 0.60
@set VERSION 3.80
@set UPDATED 08 July 2002
@set UPDATE-MONTH July 2002
@set EDITION 0.61
@set VERSION 3.81
@set UPDATED 02 May 2003
@set UPDATE-MONTH May 2003
@comment The ISBN number might need to change on next publication.
@set ISBN 1-882114-81-7 @c From Brian Youmans <3diff@gnu.org>, 25 Apr 2000
@ -38,7 +38,7 @@ and issues the commands to recompile them.
This is Edition @value{EDITION}, last updated @value{UPDATED},
of @cite{The GNU Make Manual}, for @code{make}, Version @value{VERSION}.
Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002
Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003
Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
@ -1671,9 +1671,9 @@ executed by the shell (normally @samp{sh}), but with some extra features
There are actually two different types of prerequisites understood by
GNU @code{make}: normal prerequisites such as described in the
previous section, and @dfn{order-only} prerequisites. A normal
prerequisite actually makes two statements: first, it imposes an order
of execution of build commands: any commands necessary to build any of
a target's prerequisites will be fully executed before any commands
prerequisite makes two statements: first, it imposes an order of
execution of build commands: any commands necessary to build any of a
target's prerequisites will be fully executed before any commands
necessary to build the target. Second, it imposes a dependency
relationship: if any prerequisite is newer than the target, then the
target is considered out-of-date and must be rebuilt.

2
job.c
View File

@ -3444,7 +3444,7 @@ construct_command_argv (char *line, char **restp, struct file *file,
free (buf);
}
}
#endif __EMX__
#endif /* __EMX__ */
ifs = allocated_variable_expand_for_file ("$(IFS)", file);

4
main.c
View File

@ -1,6 +1,6 @@
/* Argument parsing and main program of GNU Make.
Copyright (C) 1988, 1989, 1990, 1991, 1994, 1995, 1996, 1997, 1998, 1999,
2002 Free Software Foundation, Inc.
2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Make.
GNU Make is free software; you can redistribute it and/or modify
@ -41,7 +41,7 @@ MA 02111-1307, USA. */
# include <sys/types.h>
# include <sys/wait.h>
#endif
#if defined(MAKE_JOBSERVER) && defined(HAVE_FCNTL_H)
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif