INTEGRATION: CWS sal02 (1.4.86); FILE MERGED

2003/03/20 13:36:49 tra 1.4.86.2: RESYNC: (1.4-1.4.28.1); FILE MERGED
2003/03/20 13:15:22 tra 1.4.86.1: test for osl_getVolumeInformation
This commit is contained in:
Rüdiger Timm 2003-04-08 14:54:30 +00:00
parent 5d44a7ab79
commit 0073ef6995

View file

@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.10 $
# $Revision: 1.11 $
#
# last change: $Author: hr $ $Date: 2003-03-26 16:47:23 $
# last change: $Author: rt $ $Date: 2003-04-08 15:54:30 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -68,7 +68,10 @@ LIBTARGET=NO
TARGETTYPE=CUI
ENABLE_EXCEPTIONS=TRUE
TESTAPP=test_osl_joinProcess
TESTAPP=test_osl_getVolInfo
#TESTAPP=test_osl_joinProcess
#TESTAPP=getlocaleinfotest
#TESTAPP=test_osl_joinProcess
#TESTAPP=getlocaleinfotest
#TESTAPP=salstattest
#TESTAPP=saldyntest
@ -93,6 +96,28 @@ TESTAPP=test_osl_joinProcess
# --- Files --------------------------------------------------------
.IF "$(TESTAPP)" == "test_osl_getVolInfo"
SHL1OBJS=$(SLO)$/t_osl_getVolInfo.obj
SHL1TARGET=togvi
.IF "$(GUI)" == "WNT"
APP1STDLIBS=kernel32.lib
SHL1STDLIBS=$(LB)$/isal.lib
SHL1STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib
.ENDIF
.IF "$(GUI)" == "UNX"
SHL1STDLIBS=$(LB)$/libsal.so
SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a
.ENDIF
SHL1IMPLIB=i$(SHL1TARGET)
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
DEF1EXPORTFILE=export.exp
.ENDIF
.IF "$(TESTAPP)" == "test_osl_joinProcess"
OBJFILES=$(OBJ)$/t_ojp_exe.obj
APP1TARGET=ojpx