diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:45:20 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-10-15 14:45:20 +0000 |
| commit | 1fd701c661f61bee4f2e815585fb236eab7901ea (patch) | |
| tree | 9a90993775d18c43bf954319a69acbde33ffb667 /dmake/os2 | |
| parent | 4fc8c2c61f592c7fc8225f4d61d00aeb8241d903 (diff) | |
INTEGRATION: CWS dmake411 (1.2.28); FILE MERGED
2007/09/22 22:08:41 vq 1.2.28.3: RESYNC: (1.2-1.3); FILE MERGED
2007/09/16 03:57:13 vq 1.2.28.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.2.28.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.
Diffstat (limited to 'dmake/os2')
| -rw-r--r-- | dmake/os2/ruletab.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/dmake/os2/ruletab.c b/dmake/os2/ruletab.c index 42946dd14c6d..dfe6f72f63da 100644 --- a/dmake/os2/ruletab.c +++ b/dmake/os2/ruletab.c @@ -1,4 +1,4 @@ -/* RCS $Id: ruletab.c,v 1.3 2007-09-20 14:34:28 vg Exp $ +/* RCS $Id: ruletab.c,v 1.4 2007-10-15 15:45:20 ihi Exp $ -- -- SYNOPSIS -- Default initial configuration of dmake. @@ -33,8 +33,6 @@ * We dont need the two different cases of Makefile, so only keep the * pretty one. */ -// ".IMPORT .IGNORE: DMAKEROOT SOLARVER UPD INPATH OS UPDMINOREXT", - static char *_rules[] = { "MAXLINELENGTH := 8190", "MAXPROCESSLIMIT := 16", |