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

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