diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-02 11:12:59 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-02 11:12:59 +0000 |
| commit | 2b1b327a87a8193b954ad660ae5d6551e5b6fd67 (patch) | |
| tree | e904674e871a38db44a5c2e2c0c12147c58aadda /sal/rtl/source/makefile.mk | |
| parent | 78de65380286e46352a662c570c186cf410a9829 (diff) | |
INTEGRATION: CWS mhu12 (1.23.20); FILE MERGED
2006/04/11 17:01:24 mhu 1.23.20.1: #125511# #i23172# #i57754# added alloc_arena.o + alloc_cache.o, replaced alloc.o by alloc_global.o.
Diffstat (limited to 'sal/rtl/source/makefile.mk')
| -rw-r--r-- | sal/rtl/source/makefile.mk | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk index 54a7f55cc327..b56db1c6ac15 100644 --- a/sal/rtl/source/makefile.mk +++ b/sal/rtl/source/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.23 $ +# $Revision: 1.24 $ # -# last change: $Author: kz $ $Date: 2006-01-31 18:30:13 $ +# last change: $Author: rt $ $Date: 2006-05-02 12:12:59 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -61,7 +61,10 @@ ALWAYSDBGFILES=$(SLO)$/debugprint.obj ALWAYSDBGTARGET=do_it_alwaysdebug .ENDIF -SLOFILES= $(SLO)$/alloc.obj \ +SLOFILES= \ + $(SLO)$/alloc_global.obj \ + $(SLO)$/alloc_cache.obj \ + $(SLO)$/alloc_arena.obj \ $(SLO)$/memory.obj \ $(SLO)$/cipher.obj \ $(SLO)$/crc.obj \ @@ -87,7 +90,10 @@ SLOFILES= $(SLO)$/alloc.obj \ $(SLO)$/math.obj #.IF "$(UPDATER)"=="YES" -OBJFILES= $(OBJ)$/alloc.obj \ +OBJFILES= \ + $(OBJ)$/alloc_global.obj \ + $(OBJ)$/alloc_cache.obj \ + $(OBJ)$/alloc_arena.obj \ $(OBJ)$/memory.obj \ $(OBJ)$/cipher.obj \ $(OBJ)$/crc.obj \ @@ -123,8 +129,8 @@ OBJFILES= $(OBJ)$/alloc.obj \ # SECOND_BUILD=SYSALLOC -SYSALLOC_SLOFILES= $(SLO)$/alloc.obj -SYSALLOCCDEFS+=-DFORCE_SYSALLOC -DOSL_DEBUG_LEVEL=0 +SYSALLOC_SLOFILES= $(SLO)$/alloc_global.obj +SYSALLOCCDEFS+=-DFORCE_SYSALLOC .ENDIF # .IF "$(OS)"=="LINUX" |