diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 17:39:05 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 17:39:05 +0000 |
| commit | cd41a84408ede356513ad24f1a90816059d87829 (patch) | |
| tree | 9fc03d6993e18a848231c90593fb41ca1663d191 /sal/util | |
| parent | ff187bd647900bb227e4468fb8660d19f11de3dc (diff) | |
INTEGRATION: CWS ooogrind (1.31.116); FILE MERGED
2004/06/21 14:30:29 thb 1.31.116.4: RESYNC: (1.31-1.32); FILE MERGED
2004/06/11 17:46:47 thb 1.31.116.3: #i26634# Cleaned up and adhered more closely to *nix and UDK conventions
2004/03/17 17:36:49 thb 1.31.116.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.31.116.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/util')
| -rw-r--r-- | sal/util/makefile.mk | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index 6c37cc984..c41ea71fd 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.32 $ +# $Revision: 1.33 $ # -# last change: $Author: obo $ $Date: 2004-03-19 14:57:49 $ +# last change: $Author: hjs $ $Date: 2004-06-25 18:39:05 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -186,6 +186,24 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) +# +# This part builds a tiny extra lib, +# containing an alloc.c which uses system +# heap instead of our own mem management. +# This is e.g. useful for proper valgrinding +# the office. +# +.IF "$(OS)"=="LINUX" + +TARGET2 = salalloc_malloc +SHL2TARGET= $(TARGET2) +SHL2IMPLIB= i$(TARGET2) +SHL2VERSIONMAP= salalloc.map + +SHL2LIBS+=$(SLB)$/SYSALLOC_cpprtl.lib + +.ENDIF # .IF "$(OS)"=="LINUX" + # --- Coverage ----------------------------------------------------- # LLA: 20040304 The follows lines are an additional which is only need if we run # coverage tests. For normal test runs this feature is not used. |