INTEGRATION: CWS hotmac_DEV300 (1.36.64); FILE MERGED
2008/08/27 07:43:21 kr 1.36.64.1: #i92388#
This commit is contained in:
parent
b19462a19e
commit
8e1b51ec05
1 changed files with 11 additions and 1 deletions
|
@ -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=
|
||||
|
|
Loading…
Reference in a new issue