INTEGRATION: CWS ooo20040509 (1.7.6); FILE MERGED

2004/06/14 15:10:48 svesik 1.7.6.2: try to reduce conflictness
2004/05/03 21:13:27 cmc 1.7.6.1: if SOLAR_JAVA is unset then JVMACCESSLIB doesn't get built

sj2/util/makefile.mk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.8 $
+#   $Revision: 1.9 $
 #
-#   last change: $Author: obo $ $Date: 2004-06-01 09:13:55 $
+#   last change: $Author: rt $ $Date: 2004-06-16 10:20:40 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -86,8 +86,11 @@ SHL1STDLIBS= \
         $(UNOTOOLSLIB) \
         $(TOOLSLIB) \
         $(CPPULIB) \
-        $(SALLIB) \
-    $(JVMACCESSLIB)
+        $(SALLIB)
+
+.IF "$(SOLAR_JAVA)"!=""
+    SHL1STDLIBS+=$(JVMACCESSLIB)
+.ENDIF
 
 SHL1LIBS=   $(SLB)$/$(TARGET).lib
 SHL1DEF=    $(MISC)$/$(SHL1TARGET).def