diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 17:38:49 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 17:38:49 +0000 |
| commit | b797d95ae621b5aebe821ec06c21beb6aea8b427 (patch) | |
| tree | 08c088ac2a46979a43e4af69b5480d1eafc592c2 /sal | |
| parent | c7c4980b29933b4c409a83c7f5ab241a90ed736b (diff) | |
INTEGRATION: CWS ooogrind (1.19.172); FILE MERGED
2004/06/11 17:47:06 thb 1.19.172.4: #i26634# Cleaned up and adhered more closely to *nix and UDK conventions
2004/05/10 17:20:49 thb 1.19.172.3: #i26634# Added comment separator
2004/03/17 17:36:49 thb 1.19.172.2: #i26634# Now defining OSL_DEBUG_LEVEL=0, to avoid need to link against standard sal lib
2004/03/17 16:51:51 thb 1.19.172.1: #i26634# Building second version of sal lib, with FORCE_SYSALLOC defined. This will then later be LD_PRELOADED to soffice, to enable proper valgrinding
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/rtl/source/makefile.mk | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk index 737f3f40e1cb..a18ed09e4136 100644 --- a/sal/rtl/source/makefile.mk +++ b/sal/rtl/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.19 $ +# $Revision: 1.20 $ # -# last change: $Author: hr $ $Date: 2003-03-26 16:46:39 $ +# last change: $Author: hjs $ $Date: 2004-06-25 18:38:49 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -127,6 +127,23 @@ OBJFILES= $(OBJ)$/alloc.obj \ $(OBJ)$/tres.obj \ $(OBJ)$/math.obj +# --- Extra objs ---------------------------------------------------- + +.IF "$(OS)"=="LINUX" + +# +# This part builds a second version of alloc.c, with +# FORCE_SYSALLOC defined. Is later used in util/makefile.mk +# to build a tiny replacement lib to LD_PRELOAD into the +# office, enabling e.g. proper valgrinding. +# + +SECOND_BUILD=SYSALLOC +SYSALLOC_SLOFILES= $(SLO)$/alloc.obj +SYSALLOCCDEFS+=-DFORCE_SYSALLOC -DOSL_DEBUG_LEVEL=0 + +.ENDIF # .IF "$(OS)"=="LINUX" + #.ENDIF .ENDIF |