INTEGRATION: CWS ause048 (1.185.22); FILE MERGED

2006/02/17 18:08:54 hjs 1.185.22.1: #i60091# applied patch
This commit is contained in:
Rüdiger Timm 2006-03-08 13:00:01 +00:00
parent 194a94bf7a
commit 728a0d558a

View file

@ -4,9 +4,9 @@
# #
# $RCSfile: settings.mk,v $ # $RCSfile: settings.mk,v $
# #
# $Revision: 1.186 $ # $Revision: 1.187 $
# #
# last change: $Author: rt $ $Date: 2006-02-09 14:21:41 $ # last change: $Author: rt $ $Date: 2006-03-08 14:00:01 $
# #
# The Contents of this file are made available subject to # The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
@ -186,12 +186,11 @@ JAVADOC=javadoc -J-Xmx120m
.ENDIF .ENDIF
#required arguments #required arguments
.IF "$(JAVACACHE)" != ""
JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
.ELSE
JAVAC=$(JAVACOMPILER) JAVAC=$(JAVACOMPILER)
JAVAI=$(JAVAINTERPRETER) JAVAI=$(JAVAINTERPRETER)
.IF "$(JAVACACHE)" != ""
JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
JAVAI+=-Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
.ENDIF .ENDIF
#classpath and response #classpath and response