INTEGRATION: CWS nojava1 (1.5.28); FILE MERGED
2004/09/24 14:34:58 haggai 1.5.28.3: RESYNC: (1.5-1.6); FILE MERGED 2004/08/16 15:20:48 cmc 1.5.28.2: #i33045# use normal -DSOLAR_JAVA 2004/08/16 14:21:41 cmc 1.5.28.1: #i33045# build jvmaccess even without java, just default to failure on javarelated stuff
This commit is contained in:
parent
b3bad513d7
commit
4ff64a3236
1 changed files with 2 additions and 7 deletions
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.6 $
|
||||
# $Revision: 1.7 $
|
||||
#
|
||||
# last change: $Author: hr $ $Date: 2004-07-23 12:03:28 $
|
||||
# last change: $Author: hr $ $Date: 2004-11-09 11:49:59 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -67,11 +67,6 @@ ENABLE_EXCEPTIONS = TRUE
|
|||
|
||||
.INCLUDE: settings.mk
|
||||
|
||||
.IF "$(SOLAR_JAVA)"==""
|
||||
nojava:
|
||||
@echo "Not building jvmaccess because Java is disabled"
|
||||
.ENDIF
|
||||
|
||||
UNOTYPES= com.sun.star.uno.TypeClass com.sun.star.uno.XInterface
|
||||
|
||||
UNOUCRDEP = $(SOLARBINDIR)$/udkapi.rdb
|
||||
|
|
Loading…
Reference in a new issue