From 48b433c12e9c48e07acbfc8d8ac7d03a96360a07 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Tue, 1 Mar 2005 15:16:29 +0000 Subject: [PATCH] INTEGRATION: CWS gcj2 (1.15.4); FILE MERGED 2005/02/02 10:41:44 cmc 1.15.4.1: #i41879# gcj, despite its java version claim, cannot compile the accessibility stuff --- .../org/openoffice/java/accessibility/makefile.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk index ff67e1147b50..ae950e91d17e 100755 --- a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk +++ b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.16 $ # -# last change: $Author: rt $ $Date: 2004-11-02 14:34:59 $ +# last change: $Author: kz $ $Date: 2005-03-01 16:16:29 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -72,7 +72,10 @@ USE_JAVAVER:=TRUE .INCLUDE : settings.mk .IF "$(JAVANUMVER:s/.//)" >= "000100040000" - +.IF "$(JDK)" == "gcj" +all: + @echo This dir cannot be build with gcj because of java.awt.Window.AccessibleAWTWindow +.ELSE JAVADIR = $(OUT)$/misc$/java JARFILES = sandbox.jar jurt.jar unoil.jar ridl.jar JAVAFILES = \ @@ -126,6 +129,7 @@ JARTARGET = $(TARGET).jar JARCOMPRESS = TRUE JARCLASSDIRS = $(PACKAGE) +.ENDIF .ENDIF # "$(JAVANUMVER:s/.//)" >= "000100040000" # --- Targets ------------------------------------------------------