INTEGRATION: CWS qadev17 (1.2.50); FILE MERGED

2004/03/26 11:45:05 lla 1.2.50.1: #116021# add rtl_ustr
This commit is contained in:
Rüdiger Timm 2004-05-03 08:12:40 +00:00
parent 03a07a3455
commit 1d38ea92c9

View file

@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.2 $
# $Revision: 1.3 $
#
# last change: $Author: kz $ $Date: 2003-11-18 16:42:55 $
# last change: $Author: rt $ $Date: 2004-05-03 09:12:40 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -80,13 +80,8 @@ SHL1OBJS= \
SHL1TARGET= rtl_OUString2
SHL1STDLIBS=\
$(SALLIB)
.IF "$(GUI)" == "WNT"
SHL1STDLIBS+= $(SOLARLIBDIR)$/cppunit.lib
.ENDIF
.IF "$(GUI)" == "UNX"
SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
.ENDIF
$(SALLIB) \
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
@ -97,9 +92,23 @@ SHL1VERSIONMAP= export.map
# auto generated Target:joblist
# END ------------------------------------------------------------------
# BEGIN ----------------------------------------------------------------
SHL2OBJS= \
$(SLO)$/rtl_ustr.obj
SHL2TARGET= rtl_ustr
SHL2STDLIBS=\
$(SALLIB) \
$(CPPUNITLIB)
SHL2IMPLIB= i$(SHL2TARGET)
DEF2NAME =$(SHL2TARGET)
SHL2VERSIONMAP= export.map
# END ------------------------------------------------------------------
#------------------------------- All object files -------------------------------
# do this here, so we get right dependencies
SLOFILES=$(SHL1OBJS)
# SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------