Attachment #33774 for issue #60948

View | Details | Raw Unified | Return to issue 60948
Collapse All | Expand All

Lines 5-10 Link Here

(-)dmake/NEWS (-1 / +5 lines)
5	Version 4.4-cvs <unreleased>	5	Version 4.4-cvs <unreleased>
6	============================	6	============================
7		7
		8	2006/02/01 Volker Quetschke (vq@openoffice.org)
		9	#i60948# Add -m option family to generate timing information for targets
		10	and/or recipes.
		11
8	2005/09/19 Volker Quetschke (vq@openoffice.org)	12	2005/09/19 Volker Quetschke (vq@openoffice.org)
9	#i53148# Fix $(shell ...) macro picking up the output of earlier	13	#i53148# Fix $(shell ...) macro picking up the output of earlier
10	recipe lines in parallel builds.	14	recipe lines in parallel builds.
Lines 14-20 Link Here
14		18
15	2005/06/01 Volker Quetschke (vq@openoffice.org)	19	2005/06/01 Volker Quetschke (vq@openoffice.org)
16	#i39248# Add a testsuite to test some dmake features (only for autotools	20	#i39248# Add a testsuite to test some dmake features (only for autotools
17	builds). Start the tests with "make check".	21	builds). Start the tests with "make check".
18		22
19	2005/04/21 Volker Quetschke (vq@openoffice.org)	23	2005/04/21 Volker Quetschke (vq@openoffice.org)
20	#i47851# Increase the version number to 4.4-cvs and slightly rearrange the	24	#i47851# Increase the version number to 4.4-cvs and slightly rearrange the

Lines 19-24 Link Here

(-)dmake/config.h.in (+6 lines)
19	/* Define to 1 if you have the `getcwd' function. */	19	/* Define to 1 if you have the `getcwd' function. */
20	#undef HAVE_GETCWD	20	#undef HAVE_GETCWD
21		21
		22	/* Define to 1 if you have the `gettimeofday' function. */
		23	#undef HAVE_GETTIMEOFDAY
		24
22	/* Define to 1 if you have the `getwd' function. */	25	/* Define to 1 if you have the `getwd' function. */
23	#undef HAVE_GETWD	26	#undef HAVE_GETWD
24		27
Lines 92-97 Link Here
92		95
93	/* Define to 1 if you have the <sys/stat.h> header file. */	96	/* Define to 1 if you have the <sys/stat.h> header file. */
94	#undef HAVE_SYS_STAT_H	97	#undef HAVE_SYS_STAT_H
		98
		99	/* Define to 1 if you have the <sys/time.h> header file. */
		100	#undef HAVE_SYS_TIME_H
95		101
96	/* Define to 1 if you have the <sys/types.h> header file. */	102	/* Define to 1 if you have the <sys/types.h> header file. */
97	#undef HAVE_SYS_TYPES_H	103	#undef HAVE_SYS_TYPES_H








for ac_header in fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h sys/time.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then





for ac_func in getcwd getwd putenv strcspn strerror strspn strstr setvbuf tzset settz mkstemp tempnam gettimeofday
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5

Lines 173-179 Link Here

(-)dmake/configure.in (-2 / +2 lines)
173	dnl Checks for header files.	173	dnl Checks for header files.
174	AC_HEADER_DIRENT	174	AC_HEADER_DIRENT
175	AC_HEADER_STDC	175	AC_HEADER_STDC
176	AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h)	176	AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h sys/time.h)
177		177
178	dnl Checks for typedefs, structures, and compiler characteristics.	178	dnl Checks for typedefs, structures, and compiler characteristics.
179	AC_C_CONST	179	AC_C_CONST
Lines 195-201 Link Here
195	AC_TYPE_SIGNAL	195	AC_TYPE_SIGNAL
196	AC_FUNC_UTIME_NULL	196	AC_FUNC_UTIME_NULL
197	AC_FUNC_VPRINTF	197	AC_FUNC_VPRINTF
198	AC_CHECK_FUNCS(getcwd getwd putenv strcspn strerror strspn strstr setvbuf tzset settz mkstemp tempnam)	198	AC_CHECK_FUNCS(getcwd getwd putenv strcspn strerror strspn strstr setvbuf tzset settz mkstemp tempnam gettimeofday)
199		199
200		200
201	dnl * output to disk *	201	dnl * output to disk *

Lines 17-23 Link Here

(-)dmake/dmake.c
17	-- -C file - duplicate console output to file (MSDOS only)	17	-- -C file - duplicate console output to file (MSDOS only)
18	-- -K file - .KEEP_STATE file	18	-- -K file - .KEEP_STATE file
19	-- -#dbug_string - dump out debugging info, see below	19	-- -#dbug_string - dump out debugging info, see below




#define USAGE \
"Usage:\n%s [-P#] [-{f|K} file] [-{w|W} target ...] [macro[!][[*][+][:]]=value ...]\n"
#define USAGE2 \
"%s [-v[cdfimrtw]] [-m[trae]] [-ABcdeEghiknpqrsStTuVxX] [target ...]\n"
#else
#define USAGE \
"Usage:\n%s [-P#] [-{f|C|K} file] [-{w|W} target ...] [macro[!][[*][+][:]]=value ...]\n"
#define USAGE2 \
"%s [-v[cdfimrtw]] [-m[trae]] [-ABcdeEghiknpqrsStTuVxX] [target ...]\n"
#endif

/* We don't use va_end at all, so define it out so that it doesn't produce

   stdout_redir = NIL(FILE);

   Verbose     = V_NOFLAG;
   Measure     = M_NOFLAG;
   Transitive  = TRUE;
   Nest_level  = 0;
   Line_number = 0;

               } 
	       break;

	    case 'm':
	       if( p[-1] != '-' ) Usage(TRUE);
	       while( p[1] ) switch( *++p ) {
		  case 't': Measure |= M_TARGET;    break;
		  case 'r': Measure |= M_RECIPE;    break;
		  case 'a': Measure |= M_ABSPATH;   break;
		  case 'e': Measure |= M_SHELLESC;  break;

		  default: Usage(TRUE); break;
	       }
	       if( !Measure ) Measure = M_TARGET;
	       break;

	    case 'P':
	       if( p[1] ) {
		  Def_macro( "MAXPROCESS", p+1, M_MULTI|M_EXPANDED );

   puts("    -K file    - use file as the .KEEP_STATE file");
   puts("    -w target  - show what you would do if 'target' were out of date");
   puts("    -W target  - rebuild pretending that 'target' is out of date");
   puts("    -v[cdfimrtw] - verbose, indicate what we are doing, (-v => -vcdfimrtw)");
   puts("                   c => dump directory cache info only" );
   puts("                   d => dump change of directory info only" );
   puts("                   f => dump file open/close info only" );

   puts("                        overrides -s" );
   puts("                   t => keep temporary files when done" );
   puts("                   w => issue non-essential warnings\n" );

   puts("    -m[trae] - Measure timing information, (-m => -mt)");
   puts("               t => display the start and end time of each target" );
   puts("               r => display the start and end time of each recipe" );
   puts("               a => display the target as an absolute path" );
   puts("               e => display the timing of shell escape macros\n" );

   puts("Options: (can be catenated, ie -irn == -i -r -n)");
   puts("    -A   - enable AUGMAKE special target mapping");

Lines 100-105 Link Here

(-)dmake/dmake.h (+9 lines)
100	#define A_POOL 0x08000000 /* used for directory pool */	100	#define A_POOL 0x08000000 /* used for directory pool */
101	#define A_ERROR 0x10000000 /* used to halt construction */	101	#define A_ERROR 0x10000000 /* used to halt construction */
102	#define A_FIRST 0x20000000 /* used for .INCLUDE termination*/	102	#define A_FIRST 0x20000000 /* used for .INCLUDE termination*/
		103	#define A_SHELLESC 0x40000000 /* used for shell escape target */
103		104
104		105
105	/* Global and target bit flag definitions */	106	/* Global and target bit flag definitions */
Lines 186-191 Link Here
186	#define V_FORCEECHO 0x80	187	#define V_FORCEECHO 0x80
187	#define V_ALL (V_LEAVE_TMP \| V_DIR_SET \| V_INFER \| V_MAKE \|\	188	#define V_ALL (V_LEAVE_TMP \| V_DIR_SET \| V_INFER \| V_MAKE \|\
188	V_FILE_IO \| V_DIR_CACHE \| V_WARNALL \| V_FORCEECHO)	189	V_FILE_IO \| V_DIR_CACHE \| V_WARNALL \| V_FORCEECHO)
		190
		191	/* Flags for controling use of -m switch */
		192	#define M_NOFLAG 0x00
		193	#define M_TARGET 0x01
		194	#define M_RECIPE 0x02
		195	#define M_ABSPATH 0x04
		196	#define M_SHELLESC 0x08
		197	#define M_ALL (M_TARGET \| M_RECIPE \| M_ABSPATH \| M_SHELLESC)
189		198
190	/* Macro definitions for use inside dmake */	199	/* Macro definitions for use inside dmake */
191	#define SET_TOKEN(A, B) (A)->tk_str = (B);\	200	#define SET_TOKEN(A, B) (A)->tk_str = (B);\

Lines 553-559 Link Here

(-)dmake/function.c (-1 / +5 lines)
553	cell.ce_fname = cname.ht_name;	553	cell.ce_fname = cname.ht_name;
554	cell.ce_recipe = &rcp;	554	cell.ce_recipe = &rcp;
555	cell.ce_flag = F_TARGET\|F_RULES;	555	cell.ce_flag = F_TARGET\|F_RULES;
556	cell.ce_attr = A_PHONY\|A_SILENT;	556	/* Setting A_SILENT supresses the recipe output from Print_cmnd(). */
		557	cell.ce_attr = A_PHONY\|A_SILENT\|A_SHELLESC;
		558
		559	if( Measure & M_TARGET )
		560	Do_profile_output( "s", M_TARGET, &cell );
557		561
558	/* Print the shell escape command. */	562	/* Print the shell escape command. */
559	if( !(rcp.st_attr & A_SILENT) ) {	563	if( !(rcp.st_attr & A_SILENT) ) {

Lines 237-243 Link Here

(-)dmake/make.c (-4 / +7 lines)
237	char *inf = NIL(char);	237	char *inf = NIL(char);
238	char *outall = NIL(char);	238	char *outall = NIL(char);
239	char *imm = NIL(char);	239	char *imm = NIL(char);
240	int rval = 0;	240	int rval = 0; /* 0==ready, 1==target still running, -1==error */
241	int push = 0;	241	int push = 0;
242	int made = F_MADE;	242	int made = F_MADE;
243	int ignore;	243	int ignore;
Lines 597-602 Link Here
597	\|\| ((cp->ce_flag & F_TARGET) && Force)	597	\|\| ((cp->ce_flag & F_TARGET) && Force)
598	) {	598	) {
599		599
		600	if( Measure & M_TARGET )
		601	Do_profile_output( "s", M_TARGET, cp );
		602
600	/* Only checking so stop as soon as we determine we will make	603	/* Only checking so stop as soon as we determine we will make
601	* something */	604	* something */
602	if( Check ) {	605	if( Check ) {
Lines 979-988 Link Here
979	Execute the commands one at a time that are pointed to by the rules pointer	982	Execute the commands one at a time that are pointed to by the rules pointer
980	of the target cp. If a group is indicated, then the ce_attr determines	983	of the target cp. If a group is indicated, then the ce_attr determines
981	.IGNORE and .SILENT treatment for the group.	984	.IGNORE and .SILENT treatment for the group.
982		985
983	The function returns 0, if the command is executed and has successfully	986	The function returns 0, if the command is executed and has successfully
984	returned, and returns 1 if the command is executing but has not yet	987	returned, and it returns 1 if the command is executing but has not yet
985	returned (for parallel makes).	988	returned or -1 if an error occured (Return value from Do_cmnd()).
986		989
987	The F_MADE bit in the cell is guaranteed set when the command has	990	The F_MADE bit in the cell is guaranteed set when the command has
988	successfully completed. */	991	successfully completed. */

Lines 67-72 Link Here

(-)dmake/sysintf.c (-7 / +68 lines)
67	# define HAVE_GETMODULEFILENAMEFUNC 1	67	# define HAVE_GETMODULEFILENAMEFUNC 1
68	# include <windows.h>	68	# include <windows.h>
69	# include <winbase.h>	69	# include <winbase.h>
		70
		71	/* this is needed for the _ftime call below. Only needed here. */
		72	# include <sys/timeb.h>
70	#endif	73	#endif
71		74
72	#include "extern.h"	75	#include "extern.h"
Lines 168-175 Link Here
168	PUBLIC time_t	171	PUBLIC time_t
169	Do_time()	172	Do_time()
170	{	173	{
171	extern time_t time();	174	return (time( NIL(time_t) ));
172	return (time((time_t*)0));	175	}
		176
		177
		178
		179	/*
		180	** Print profiling information
		181	*/
		182	PUBLIC void
		183	Do_profile_output( text, mtype, target )
		184	char *text;
		185	uint16 mtype;
		186	CELLPTR target;
		187	{
		188
		189	time_t time_sec;
		190	uint32 time_msec;
		191	char *tstrg;
		192	char *tname;
		193
		194	#ifdef HAVE_GETTIMEOFDAY
		195	struct timeval timebuffer;
		196	gettimeofday(&timebuffer, NULL);
		197	time_sec = timebuffer.tv_sec;
		198	time_msec = timebuffer.tv_usec/1000;
		199	#else
		200	#if defined(_MSC_VER) \|\| defined(__MINGW32__)
		201	struct _timeb timebuffer;
		202	_ftime( &timebuffer );
		203	time_sec = timebuffer.time;
		204	time_msec = timebuffer.millitm;
		205	# else
		206	time_sec = time( NIL(time_t) );
		207	time_msec = 0;
		208	# endif
		209	#endif
		210
		211	tname = target->CE_NAME;
		212	if( mtype & M_TARGET ) {
		213	tstrg = "target";
		214	/* Don't print special targets .TARGETS and .ROOT */
		215	if( tname[0] == '.' && (strcmp(".TARGETS", tname) == 0 \|\| \
		216	strcmp(".ROOT", tname) == 0) ) {
		217	return;
		218	}
		219	} else {
		220	tstrg = "recipe";
		221	}
		222
		223	/* Don't print shell escape targets if not especially requested. */
		224	if( (target->ce_attr & A_SHELLESC) && !(Measure & M_SHELLESC) ) {
		225	return;
		226	}
		227
		228	/* Print absolute path if requested. */
		229	if( !(target->ce_attr & A_SHELLESC) && (Measure & M_ABSPATH) ) {
		230	printf("%s %s %lu.%.3u %s%s%s\n",text, tstrg, time_sec, time_msec, Pwd, DirSepStr, tname);
		231	} else {
		232	printf("%s %s %lu.%.3u %s\n",text, tstrg, time_sec, time_msec, tname);
		233	}
173	}	234	}
174		235
175		236
Lines 219-225 Link Here
219		280
220	/* NOTE: runargv must return either 0 or 1, 0 ==> command executed, and	281	/* NOTE: runargv must return either 0 or 1, 0 ==> command executed, and
221	* we waited for it to return, 1 ==> command started and is running	282	* we waited for it to return, 1 ==> command started and is running
222	* concurrently with make process. */	283	* concurrently with make process or -1 if something failed. */
		284	/* NOTE2: runargv currently always returns 1 (possible speed up) or -1. */
223	return(i);	285	return(i);
224	}	286	}
225		287
Lines 289-297 Link Here
289	Read_env_string(ename)	351	Read_env_string(ename)
290	char *ename;	352	char *ename;
291	{	353	{
292	#if !defined(_MSC_VER) \|\| _MSC_VER < 600
293	extern char *getenv();
294	#endif
295	return( getenv(ename) );	354	return( getenv(ename) );
296	}	355	}
297		356
Lines 306-312 Link Here
306	char *ename;	365	char *ename;
307	char *value;	366	char *value;
308	{	367	{
309	extern int putenv();
310	char* p;	368	char* p;
311	char* envstr = DmStrAdd(ename, value, FALSE);	369	char* envstr = DmStrAdd(ename, value, FALSE);
312		370
Lines 782-787 Link Here
782	if( Verbose & V_MAKE )	840	if( Verbose & V_MAKE )
783	printf( "%s: <<<< Set [%s] time stamp to %lu\n",	841	printf( "%s: <<<< Set [%s] time stamp to %lu\n",
784	Pname, tcp->CE_NAME, tcp->ce_time );	842	Pname, tcp->CE_NAME, tcp->ce_time );
		843
		844	if( Measure & M_TARGET )
		845	Do_profile_output( "e", M_TARGET, tcp );
785		846
786	Unlink_temp_files( tcp );	847	Unlink_temp_files( tcp );
787	tcp->ce_flag \|= F_MADE;	848	tcp->ce_flag \|= F_MADE;

Lines 100-105 Link Here

(-)dmake/vextern.h (+1 lines)
100	EXTERN int Touch; /* -t */	100	EXTERN int Touch; /* -t */
101	EXTERN int Check; /* -q */	101	EXTERN int Check; /* -q */
102	EXTERN uint16 Verbose; /* -v */	102	EXTERN uint16 Verbose; /* -v */
		103	EXTERN uint16 Measure; /* -m */
103	EXTERN int Microsoft; /* -M */	104	EXTERN int Microsoft; /* -M */
104	EXTERN int Transitive; /* -T */	105	EXTERN int Transitive; /* -T */
105	EXTERN int No_exec; /* -X */	106	EXTERN int No_exec; /* -X */

Lines 111-116 Link Here

(-)dmake/mac/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));




.SH NAME
\fBdmake\fR \- maintain program groups, or interdependent files
.SH SYNOPSIS
.nh
.B dmake
[\-P#] [\-{f|C|K} file] [\-{w|W} target ...]
[macro[[!][*][+][:]]=\fIvalue\fP ...]
[\-ABcdeEghiknpqrsStTuVxX] [\-v[cdfimrtw]] [\-m[trae]] [target ...]
.hy 14
.SH DESCRIPTION
.PP
.B dmake

Ordinarily \fBdmake\fR stops after a command returns a non-zero status,
specifying \fB\-k\fR causes \fBdmake\fR to ignore the error
and continue to make as much as possible.
.IP "\fB\-m[trae]\fR"
Measure timing information. Print the time when targets and/or recipes
are started and finished to stdout. The following format is used:
.IP ""
\fB{s|e} {target|recipe} time maketarget\fP
.IP ""
\fBs\fP or \fBe\fP stands for started or ended, \fBtarget\fP or
\fBrecipe\fP denotes if this line refers to the whole target or a
recipe. \fBtime\fP is displayed in Unix time format, i.e. the number
of seconds since an epoch.  (Since 1970-01-01T00:00:00Z).  \fBmaketarget\fP
obviously represents the target the timing information is given for.
The optional flags \fB[trae]\fP can be used to change the information that
is displayed.  If no optional flags are given only the \fBt\fP flag
is assumed to be selected, ie. \fB\-mt\fP.  The optional flags stand for:
.RS
.IP "\fBt\fP"
Display the start and end time of each target.
.IP "\fBr\fP"
Display the start and end time of each recipe.
.IP "\fBa\fP"
Display the target as an absolute path, i.e. prepend the current working
directory.
.IP "\fBe\fP"
Also display the start and end time of the \fB$(shell command)\fP function
(aka. shell escape) macros.
.RE
.IP "\fB\-n\fR"
Causes \fBdmake\fR to print out what it would have executed,
but does not actually execute the commands.  A special check is made for

each term expands to the empty string; otherwise, it returs the string
"t".
.IP "$(\fBshell\fP \fBcommand\fP)"
is a shell escape macro. It runs \fIcommand\fP as if it were part of a
recipe and returns, separated by a single space, all the non-white
space terms written to stdout by the command.
For example:
.RS

Lines 51-56 Link Here

(-)dmake/msdos/runargv.c (+7 lines)
51	int status;	51	int status;
52	char **argv;	52	char **argv;
53		53
		54	if( Measure & M_RECIPE )
		55	Do_profile_output( "s", M_RECIPE, target );
		56
54	_add_child(target, ignore);	57	_add_child(target, ignore);
55	/* return immediately for noop command */	58	/* return immediately for noop command */
56	if (strncmp(cmd, "noop", 4) == 0 && (cmd[4] == ' ' \|\| cmd[4] == '\0')) {	59	if (strncmp(cmd, "noop", 4) == 0 && (cmd[4] == ' ' \|\| cmd[4] == '\0')) {
Lines 80-85 Link Here
80	}	83	}
81		84
82	if( status == -1 ) Error("%s: %s", argv[0], strerror(errno));	85	if( status == -1 ) Error("%s: %s", argv[0], strerror(errno));
		86
		87	if( Measure & M_RECIPE )
		88	Do_profile_output( "e", M_RECIPE, target );
		89
83	_finished_child(status);	90	_finished_child(status);
84	if( last && !Doing_bang ) Update_time_stamp( target );	91	if( last && !Doing_bang ) Update_time_stamp( target );
85		92

Lines 111-116 Link Here

(-)dmake/msdos/borland/bcc30/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/msdos/borland/bcc40/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/msdos/borland/bcc45/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/msdos/borland/bcc50/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/msdos/borland/tcc20/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/msdos/microsft/msc51/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/msdos/microsft/msc60/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/msdos/zortech/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/os2/ibm/icc/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/os2/ibm/icc3/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/qssl/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/tos/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 175-181 Link Here

(-)dmake/unix/runargv.c (-2 / +11 lines)
175	/* Any Fatal call can potentially loop by recursion because we	175	/* Any Fatal call can potentially loop by recursion because we
176	* are called from the Quit routine that Fatal indirectly calls	176	* are called from the Quit routine that Fatal indirectly calls
177	* since Fatal should not happen I have left this bug in here */	177	* since Fatal should not happen I have left this bug in here */
178	while( _proc_cnt == Max_proc ) {	178	while( _proc_cnt == Max_proc ) { /* This forces sequential execution for Max_proc == 1. */
179	if( Wait_for_child(FALSE, -1) == -1 ) {	179	if( Wait_for_child(FALSE, -1) == -1 ) {
180	if( ! in_quit() \|\| errno != ECHILD )	180	if( ! in_quit() \|\| errno != ECHILD )
181	Fatal( "Lost a child %d: %s", errno, strerror( errno ) );	181	Fatal( "Lost a child %d: %s", errno, strerror( errno ) );
Lines 298-303 Link Here
298	TALLOC( _procs, Max_proc, PR );	298	TALLOC( _procs, Max_proc, PR );
299	}	299	}
300		300
		301	if( Measure & M_RECIPE )
		302	Do_profile_output( "s", M_RECIPE, target );
		303
		304	/* If _use_i!=-1 then this function is called by _finished_child() */
301	if( (i = _use_i) == -1 )	305	if( (i = _use_i) == -1 )
302	for( i=0; i<Max_proc; i++ )	306	for( i=0; i<Max_proc; i++ )
303	if( !_procs[i].pr_valid )	307	if( !_procs[i].pr_valid )
Lines 335-341 Link Here
335	/* Some children we didn't make esp true if using /bin/sh to execute a	339	/* Some children we didn't make esp true if using /bin/sh to execute a
336	* a pipe and feed the output as a makefile into dmake. */	340	* a pipe and feed the output as a makefile into dmake. */
337	if( i == Max_proc ) return;	341	if( i == Max_proc ) return;
338	_procs[i].pr_valid = 0;	342
		343	_procs[i].pr_valid = 0; /* Not a running process anymore. */
		344	if( Measure & M_RECIPE )
		345	Do_profile_output( "e", M_RECIPE, _procs[i].pr_target );
		346
339	_proc_cnt--;	347	_proc_cnt--;
340	dir = DmStrDup(Get_current_dir());	348	dir = DmStrDup(Get_current_dir());
341	Set_dir( _procs[i].pr_dir );	349	Set_dir( _procs[i].pr_dir );
Lines 357-362 Link Here
357	_procs[i].pr_recipe = rp->prp_next;	365	_procs[i].pr_recipe = rp->prp_next;
358		366
359	_use_i = i;	367	_use_i = i;
		368	/* Run next recipe line. */
360	runargv( _procs[i].pr_target, rp->prp_ignore, rp->prp_group,	369	runargv( _procs[i].pr_target, rp->prp_ignore, rp->prp_group,
361	rp->prp_last, rp->prp_shell, rp->prp_cmd );	370	rp->prp_last, rp->prp_shell, rp->prp_cmd );
362	_use_i = -1;	371	_use_i = -1;

Lines 111-116 Link Here

(-)dmake/unix/386ix/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/unix/bsd43/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/unix/bsd43/uw/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/unix/bsd43/vf/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/unix/bsdarm32/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/unix/coherent/ver40/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/unix/coherent/ver42/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 114-119 Link Here

(-)dmake/unix/cygwin/public.h (+1 lines)
114	int Do_touch ANSI((char , char , char **));	114	int Do_touch ANSI((char , char , char **));
115	void Void_lib_cache ANSI((char , char ));	115	void Void_lib_cache ANSI((char , char ));
116	time_t Do_time ANSI(());	116	time_t Do_time ANSI(());
		117	void Do_profile_output ANSI((char *, uint16, CELLPTR));
117	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	118	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
118	char ** Pack_argv ANSI((int, int, char *));	119	char ** Pack_argv ANSI((int, int, char *));
119	char Read_env_string ANSI((char ));	120	char Read_env_string ANSI((char ));

Lines 114-119 Link Here

(-)dmake/unix/linux/gnu/public.h (+1 lines)
114	int Do_touch ANSI((char , char , char **));	114	int Do_touch ANSI((char , char , char **));
115	void Void_lib_cache ANSI((char , char ));	115	void Void_lib_cache ANSI((char , char ));
116	time_t Do_time ANSI(());	116	time_t Do_time ANSI(());
		117	void Do_profile_output ANSI((char *, uint16, CELLPTR));
117	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	118	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
118	char ** Pack_argv ANSI((int, int, char *));	119	char ** Pack_argv ANSI((int, int, char *));
119	char Read_env_string ANSI((char ));	120	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/unix/macosx/gnu/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 110-115 Link Here

(-)dmake/unix/solaris/public.h (+1 lines)
110	int Do_touch ANSI((char , char , char **));	110	int Do_touch ANSI((char , char , char **));
111	void Void_lib_cache ANSI((char , char ));	111	void Void_lib_cache ANSI((char , char ));
112	time_t Do_time ANSI(());	112	time_t Do_time ANSI(());
		113	void Do_profile_output ANSI((char *, uint16, CELLPTR));
113	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
114	char ** Pack_argv ANSI((int, int, char *));	115	char ** Pack_argv ANSI((int, int, char *));
115	char Read_env_string ANSI((char ));	116	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/unix/solaris/gnu/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/unix/sysvr1/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/unix/sysvr3/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 109-114 Link Here

(-)dmake/unix/sysvr3/gnu/public.h (+1 lines)
109	int Do_touch ANSI((char , char , char **));	109	int Do_touch ANSI((char , char , char **));
110	void Void_lib_cache ANSI((char , char ));	110	void Void_lib_cache ANSI((char , char ));
111	time_t Do_time ANSI(());	111	time_t Do_time ANSI(());
		112	void Do_profile_output ANSI((char *, uint16, CELLPTR));
112	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	113	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
113	char ** Pack_argv ANSI((int, int, char *));	114	char ** Pack_argv ANSI((int, int, char *));
114	char Read_env_string ANSI((char ));	115	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/unix/sysvr3/pwd/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/unix/sysvr4/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/unix/xenix/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/unix/xenix/pwd/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/win95/borland/bcc50/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/win95/microsft/vpp40/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/winnt/borland/bcc50/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/winnt/microsft/vpp40/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/winnt/mingw/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Lines 111-116 Link Here

(-)dmake/winnt/msvc6/public.h (+1 lines)
111	int Do_touch ANSI((char , char , char **));	111	int Do_touch ANSI((char , char , char **));
112	void Void_lib_cache ANSI((char , char ));	112	void Void_lib_cache ANSI((char , char ));
113	time_t Do_time ANSI(());	113	time_t Do_time ANSI(());
		114	void Do_profile_output ANSI((char *, uint16, CELLPTR));
114	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));	115	int Do_cmnd ANSI((char *, int, int, CELLPTR, int, int, int));
115	char ** Pack_argv ANSI((int, int, char *));	116	char ** Pack_argv ANSI((int, int, char *));
116	char Read_env_string ANSI((char ));	117	char Read_env_string ANSI((char ));

Return to issue 60948

Lines 4142-4148 Link Here

(-)dmake/configure (-2 / +4 lines)
4142		4142
4143		4143
4144		4144
4145	for ac_header in fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h	4145
		4146	for ac_header in fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h sys/time.h
4146	do	4147	do
4147	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`	4148	as_ac_Header=`echo "ac_cv_header_$ac_header" \| $as_tr_sh`
4148	if eval "test \"\${$as_ac_Header+set}\" = set"; then	4149	if eval "test \"\${$as_ac_Header+set}\" = set"; then
Lines 6657-6663 Link Here
6657		6658
6658		6659
6659		6660
6660	for ac_func in getcwd getwd putenv strcspn strerror strspn strstr setvbuf tzset settz mkstemp tempnam	6661
		6662	for ac_func in getcwd getwd putenv strcspn strerror strspn strstr setvbuf tzset settz mkstemp tempnam gettimeofday
6661	do	6663	do
6662	as_ac_var=`echo "ac_cv_func_$ac_func" \| $as_tr_sh`	6664	as_ac_var=`echo "ac_cv_func_$ac_func" \| $as_tr_sh`
6663	echo "$as_me:$LINENO: checking for $ac_func" >&5	6665	echo "$as_me:$LINENO: checking for $ac_func" >&5

Lines 84-95 Link Here

(-)-v{cdfimrtw} (-3 / +23 lines)
84	#define USAGE \	85	#define USAGE \
85	"Usage:\n%s [-P#] [-{f\|K} file] [-{w\|W} target ...] [macro[!][[*][+][:]]=value ...]\n"	86	"Usage:\n%s [-P#] [-{f\|K} file] [-{w\|W} target ...] [macro[!][[*][+][:]]=value ...]\n"
86	#define USAGE2 \	87	#define USAGE2 \
87	"%s [-v{cdfimrtw}] [-ABcdeEghiknpqrsStTuVxX] [target ...]\n"	88	"%s [-v[cdfimrtw]] [-m[trae]] [-ABcdeEghiknpqrsStTuVxX] [target ...]\n"
88	#else	89	#else
89	#define USAGE \	90	#define USAGE \
90	"Usage:\n%s [-P#] [-{f\|C\|K} file] [-{w\|W} target ...] [macro[!][[*][+][:]]=value ...]\n"	91	"Usage:\n%s [-P#] [-{f\|C\|K} file] [-{w\|W} target ...] [macro[!][[*][+][:]]=value ...]\n"
91	#define USAGE2 \	92	#define USAGE2 \
92	"%s [-v{cdfimrtw}] [-ABcdeEghiknpqrsStTuVxX] [target ...]\n"	93	"%s [-v[cdfimrtw]] [-m[trae]] [-ABcdeEghiknpqrsStTuVxX] [target ...]\n"
93	#endif	94	#endif
94		95
95	/* We don't use va_end at all, so define it out so that it doesn't produce	96	/* We don't use va_end at all, so define it out so that it doesn't produce
Lines 174-179 Link Here
174	stdout_redir = NIL(FILE);	175	stdout_redir = NIL(FILE);
175		176
176	Verbose = V_NOFLAG;	177	Verbose = V_NOFLAG;
		178	Measure = M_NOFLAG;
177	Transitive = TRUE;	179	Transitive = TRUE;
178	Nest_level = 0;	180	Nest_level = 0;
179	Line_number = 0;	181	Line_number = 0;
Lines 283-288 Link Here
283	}	285	}
284	break;	286	break;
285		287
		288	case 'm':
		289	if( p[-1] != '-' ) Usage(TRUE);
		290	while( p[1] ) switch( *++p ) {
		291	case 't': Measure \|= M_TARGET; break;
		292	case 'r': Measure \|= M_RECIPE; break;
		293	case 'a': Measure \|= M_ABSPATH; break;
		294	case 'e': Measure \|= M_SHELLESC; break;
		295
		296	default: Usage(TRUE); break;
		297	}
		298	if( !Measure ) Measure = M_TARGET;
		299	break;
		300
286	case 'P':	301	case 'P':
287	if( p[1] ) {	302	if( p[1] ) {
288	Def_macro( "MAXPROCESS", p+1, M_MULTI\|M_EXPANDED );	303	Def_macro( "MAXPROCESS", p+1, M_MULTI\|M_EXPANDED );
Lines 799-805 Link Here
799	puts(" -K file - use file as the .KEEP_STATE file");	814	puts(" -K file - use file as the .KEEP_STATE file");
800	puts(" -w target - show what you would do if 'target' were out of date");	815	puts(" -w target - show what you would do if 'target' were out of date");
801	puts(" -W target - rebuild pretending that 'target' is out of date");	816	puts(" -W target - rebuild pretending that 'target' is out of date");
802	puts(" -v{cdfimrtw} - verbose, indicate what we are doing, (-v => -vcdfimrtw)");	817	puts(" -v[cdfimrtw] - verbose, indicate what we are doing, (-v => -vcdfimrtw)");
803	puts(" c => dump directory cache info only" );	818	puts(" c => dump directory cache info only" );
804	puts(" d => dump change of directory info only" );	819	puts(" d => dump change of directory info only" );
805	puts(" f => dump file open/close info only" );	820	puts(" f => dump file open/close info only" );
Lines 809-814 Link Here
809	puts(" overrides -s" );	824	puts(" overrides -s" );
810	puts(" t => keep temporary files when done" );	825	puts(" t => keep temporary files when done" );
811	puts(" w => issue non-essential warnings\n" );	826	puts(" w => issue non-essential warnings\n" );
		827
		828	puts(" -m[trae] - Measure timing information, (-m => -mt)");
		829	puts(" t => display the start and end time of each target" );
		830	puts(" r => display the start and end time of each recipe" );
		831	puts(" a => display the target as an absolute path" );
		832	puts(" e => display the timing of shell escape macros\n" );
812		833
813	puts("Options: (can be catenated, ie -irn == -i -r -n)");	834	puts("Options: (can be catenated, ie -irn == -i -r -n)");
814	puts(" -A - enable AUGMAKE special target mapping");	835	puts(" -A - enable AUGMAKE special target mapping");

Lines 23-32 Link Here

(-)dmake/man/dmake.tf (-3 / +31 lines)
23	.SH NAME	23	.SH NAME
24	\fBdmake\fR \- maintain program groups, or interdependent files	24	\fBdmake\fR \- maintain program groups, or interdependent files
25	.SH SYNOPSIS	25	.SH SYNOPSIS
		26	.nh
26	.B dmake	27	.B dmake
27	[\-P#] [\-{f\|C\|K} file] [\-{w\|W} target ...]	28	[\-P#] [\-{f\|C\|K} file] [\-{w\|W} target ...]
28	[macro[[!][*][+][:]]=\fIvalue\fP ...]	29	[macro[[!][*][+][:]]=\fIvalue\fP ...]
29	[\-v{cdfimrtw}] [\-ABcdeEghiknpqrsStTuVxX] [target ...]	30	[\-ABcdeEghiknpqrsStTuVxX] [\-v[cdfimrtw]] [\-m[trae]] [target ...]
		31	.hy 14
30	.SH DESCRIPTION	32	.SH DESCRIPTION
31	.PP	33	.PP
32	.B dmake	34	.B dmake
Lines 139-144 Link Here
139	Ordinarily \fBdmake\fR stops after a command returns a non-zero status,	141	Ordinarily \fBdmake\fR stops after a command returns a non-zero status,
140	specifying \fB\-k\fR causes \fBdmake\fR to ignore the error	142	specifying \fB\-k\fR causes \fBdmake\fR to ignore the error
141	and continue to make as much as possible.	143	and continue to make as much as possible.
		144	.IP "\fB\-m[trae]\fR"
		145	Measure timing information. Print the time when targets and/or recipes
		146	are started and finished to stdout. The following format is used:
		147	.IP ""
		148	\fB{s\|e} {target\|recipe} time maketarget\fP
		149	.IP ""
		150	\fBs\fP or \fBe\fP stands for started or ended, \fBtarget\fP or
		151	\fBrecipe\fP denotes if this line refers to the whole target or a
		152	recipe. \fBtime\fP is displayed in Unix time format, i.e. the number
		153	of seconds since an epoch. (Since 1970-01-01T00:00:00Z). \fBmaketarget\fP
		154	obviously represents the target the timing information is given for.
		155	The optional flags \fB[trae]\fP can be used to change the information that
		156	is displayed. If no optional flags are given only the \fBt\fP flag
		157	is assumed to be selected, ie. \fB\-mt\fP. The optional flags stand for:
		158	.RS
		159	.IP "\fBt\fP"
		160	Display the start and end time of each target.
		161	.IP "\fBr\fP"
		162	Display the start and end time of each recipe.
		163	.IP "\fBa\fP"
		164	Display the target as an absolute path, i.e. prepend the current working
		165	directory.
		166	.IP "\fBe\fP"
		167	Also display the start and end time of the \fB$(shell command)\fP function
		168	(aka. shell escape) macros.
		169	.RE
142	.IP "\fB\-n\fR"	170	.IP "\fB\-n\fR"
143	Causes \fBdmake\fR to print out what it would have executed,	171	Causes \fBdmake\fR to print out what it would have executed,
144	but does not actually execute the commands. A special check is made for	172	but does not actually execute the commands. A special check is made for
Lines 1969-1976 Link Here
1969	each term expands to the empty string; otherwise, it returs the string	1997	each term expands to the empty string; otherwise, it returs the string
1970	"t".	1998	"t".
1971	.IP "$(\fBshell\fP \fBcommand\fP)"	1999	.IP "$(\fBshell\fP \fBcommand\fP)"
1972	Runs \fIcommand\fP as if it were part of a recipe and returns,	2000	is a shell escape macro. It runs \fIcommand\fP as if it were part of a
1973	separated by a single space, all the non-white	2001	recipe and returns, separated by a single space, all the non-white
1974	space terms written to stdout by the command.	2002	space terms written to stdout by the command.
1975	For example:	2003	For example:
1976	.RS	2004	.RS