diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-09-04 06:11:05 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-09-04 06:11:05 +0000 |
| commit | 8e1b51ec05f81ab7c13b2d7aae4402f1a39ec5cb (patch) | |
| tree | 776c780a494db8bd0eb650289d0f0ac13905c4e2 /sal | |
| parent | b19462a19e9aadf592521aa02df123b3826cf428 (diff) | |
INTEGRATION: CWS hotmac_DEV300 (1.36.64); FILE MERGED
2008/08/27 07:43:21 kr 1.36.64.1: #i92388#
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/rtl/source/makefile.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk index 5d9cbd02231c..20d227baaca5 100644 --- a/sal/rtl/source/makefile.mk +++ b/sal/rtl/source/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.36 $ +# $Revision: 1.37 $ # # This file is part of OpenOffice.org. # @@ -99,6 +99,11 @@ SLOFILES= \ $(SLO)$/debugprint.obj \ $(SLO)$/math.obj +.IF "$(OS)"=="MACOSX" +SLOFILES+=$(SLO)$/memory_fini.obj +.ENDIF + + #.IF "$(UPDATER)"=="YES" OBJFILES= \ $(OBJ)$/alloc_global.obj \ @@ -127,6 +132,11 @@ OBJFILES= \ $(OBJ)$/tres.obj \ $(OBJ)$/math.obj +.IF "$(OS)"=="MACOSX" +OBJFILES+=$(OBJ)$/memory_fini.obj +.ENDIF + + APP1TARGET=gen_makefile APP1OBJS=$(SLO)$/gen_makefile.obj APP1LIBSALCPPRT= |