diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:53:13 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:53:13 +0000 |
| commit | 7e709178b744290a8975e41346483b56ff213d46 (patch) | |
| tree | 497f198f5710183badea10bbd4ff49b012d0f699 | |
| parent | 2abb080aef97be3f24f14fff0b5e2dbbabb6d9a7 (diff) | |
INTEGRATION: CWS dmake411 (1.7.16); FILE MERGED
2007/09/16 03:57:13 vq 1.7.16.2: #i74007# Revert the part of the previous patch that lets OOODMAKEMODE
always be imported from the environment. Instead move the definition
of targets from the command line after the evaluation of the startup
makefile.
2007/09/16 03:03:42 vq 1.7.16.1: #i74007# Always import OOODMAKEMODE from the environment. Define targets from
the command line after the macros from the command line and OOODMAKEMODE
from the environment are set.
| -rw-r--r-- | dmake/unix/ruletab.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/dmake/unix/ruletab.c b/dmake/unix/ruletab.c index 2ff3271de595..d815a4f15d18 100644 --- a/dmake/unix/ruletab.c +++ b/dmake/unix/ruletab.c @@ -1,6 +1,6 @@ /* $RCSfile: ruletab.c,v $ --- $Revision: 1.8 $ --- last change: $Author: vg $ $Date: 2007-09-20 14:35:17 $ +-- $Revision: 1.9 $ +-- last change: $Author: ihi $ $Date: 2007-10-15 15:53:13 $ -- -- SYNOPSIS -- Default initial configuration of dmake. @@ -32,13 +32,8 @@ * strictly so that dmake can parse the STARTUP makefile */ static char *_rules[] = { -#ifdef __EMX__ - "MAXLINELENGTH := 8190", - "MAXPROCESSLIMIT := 16", -#else "MAXPROCESSLIMIT := 64", "MAXLINELENGTH := 32766", -#endif #include "dmakeroot.h" ".IMPORT .IGNORE: DMAKEROOT", ".MAKEFILES : makefile.mk Makefile makefile", |