diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:50:21 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:50:21 +0000 |
| commit | 84a306efa7ba4a99f034331e188b60c93cefa32a (patch) | |
| tree | 8c986255a90399f7c2c46f96e7a98aaae03d83cc /jvmaccess/util | |
| parent | 0251d5366e9249a70818dd608836ff5fd59ac884 (diff) | |
INTEGRATION: CWS nojava1 (1.4.36); FILE MERGED
2004/09/24 14:35:35 haggai 1.4.36.3: RESYNC: (1.4-1.5); FILE MERGED
2004/08/16 15:20:49 cmc 1.4.36.2: #i33045# use normal -DSOLAR_JAVA
2004/08/16 14:21:42 cmc 1.4.36.1: #i33045# build jvmaccess even without java, just default to failure on javarelated stuff
Diffstat (limited to 'jvmaccess/util')
| -rw-r--r-- | jvmaccess/util/makefile.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk index d2fa449e0788..e67d5e070ba2 100644 --- a/jvmaccess/util/makefile.mk +++ b/jvmaccess/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: hr $ $Date: 2004-09-09 11:19:44 $ +# last change: $Author: hr $ $Date: 2004-11-09 11:50:21 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -71,12 +71,6 @@ UNIXVERSIONNAMES = UDK .INCLUDE: settings.mk -.IF "$(SOLAR_JAVA)"=="" -nojava: - @echo "Not building jvmaccess because Java is disabled" -.ENDIF - - .IF "$(UNIXVERSIONNAMES)" == "" SHL1TARGET = $(TARGET)$(UDK_MAJOR)$(COMID) .ELSE # UNIXVERSIONNAMES |