From 42b34df38dfc4028006dd2d480a96982fbc5b7b7 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Tue, 15 Mar 2005 08:08:07 +0000
Subject: INTEGRATION: CWS gcj3 (1.2.2); FILE MERGED 2005/03/08 10:36:29 cmc
 1.2.2.2: #i44323# beanshell is now compilable with gcj 2005/03/08 10:35:23
 cmc 1.2.2.1: #i44323# beanshell is not compilable with gcj

---
 beanshell/makefile.mk | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'beanshell')

diff --git a/beanshell/makefile.mk b/beanshell/makefile.mk
index 9ff7ae2cd1e4..bc93449ba1d6 100644
--- a/beanshell/makefile.mk
+++ b/beanshell/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: kz $ $Date: 2005-03-01 13:13:35 $
+#   last change: $Author: obo $ $Date: 2005-03-15 09:08:07 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -66,10 +66,6 @@ PRJNAME=ooo_beanshell
 TARGET=ooo_beanshell
 
 .IF "$(SOLAR_JAVA)"!=""
-.IF "$(JDK)" == "gcj"
-all:
-        @echo This dir cannot be build with gcj because of javax.swing.text.DefaultStyledDocument
-.ELSE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
@@ -88,7 +84,6 @@ BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
 
-.ENDIF
 .ELSE
 all:
         @echo java disabled
-- 
cgit