diff options
author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 16:04:56 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 16:04:56 +0000 |
commit | aacba70524d2e8ee7a776601524678fca5040286 (patch) | |
tree | df455281a0f7109e96818976d862cfb0e253cd4e /sc | |
parent | 95130936864e86c293b62d53daef61bc081fb9ae (diff) |
INTEGRATION: CWS pchfix04 (1.37.20); FILE MERGED
2007/04/26 04:02:25 hjs 1.37.20.2: RESYNC: (1.37-1.38); FILE MERGED
2007/02/02 11:34:30 hjs 1.37.20.1: #i72289# split lib file
Diffstat (limited to 'sc')
-rw-r--r-- | sc/util/makefile.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index ab86ed9b6799..fd56d1dbe69e 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.39 $ +# $Revision: 1.40 $ # -# last change: $Author: rt $ $Date: 2007-04-25 16:15:20 $ +# last change: $Author: kz $ $Date: 2007-05-10 17:04:56 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -115,9 +115,7 @@ SHL1STDLIBS+= \ SHL1STDLIBS+= $(SCHLIB) .ENDIF -SHL1LIBS= $(LIB1TARGET) -LIB1TARGET=$(SLB)$/scall.lib -LIB1FILES = $(LIB3TARGET) $(LIB4TARGET) +SHL1LIBS=$(LIB3TARGET) $(LIB4TARGET) .IF "$(GUI)"!="UNX" .IF "$(GUI)$(COM)" != "WNTGCC" @@ -127,7 +125,7 @@ SHL1OBJS= $(SLO)$/scdll.obj SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) -DEFLIB1NAME= scall +DEFLIB1NAME= $(LIB3TARGET:b) $(LIB4TARGET:b) .IF "$(GUI)" == "WNT" SHL1RES= $(RCTARGET) |