diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-04-06 09:53:50 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-04-06 09:53:50 +0000 |
| commit | 52b458c8d7b37db74a9f5db152ee68aa617f35d1 (patch) | |
| tree | a3fa957aaefd5e67db05384c3e165e3dff8bd168 /rhino | |
| parent | a647885c2c26d9fcccf288a0d000d4b2f218b991 (diff) | |
INTEGRATION: CWS gcj4 (1.4.6); FILE MERGED
2005/04/04 08:06:12 cmc 1.4.6.1: #i46582# rhino is buildable with gcj 4.0.0 now
Diffstat (limited to 'rhino')
| -rwxr-xr-x | rhino/makefile.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/rhino/makefile.mk b/rhino/makefile.mk index 8e1fbc9cdfa7..5f769fba1b01 100755 --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: kz $ $Date: 2005-03-01 13:11:19 $ +# last change: $Author: hr $ $Date: 2005-04-06 10:53:50 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -66,11 +66,6 @@ PRJNAME=ooo_rhino TARGET=ooo_rhino .IF "$(SOLAR_JAVA)"!="" -.IF "$(JDK)" == "gcj" -all: - @echo This dir cannot be build with gcj because of javax.swing.JTextArea.replaceRange -.ELSE - # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk @@ -89,7 +84,6 @@ BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) .INCLUDE : target.mk .INCLUDE : tg_ext.mk -.ENDIF .ELSE all: @echo java disabled |