diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-16 09:20:40 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-16 09:20:40 +0000 |
| commit | 5a75b058d009f48b69e72fca8ba5d5388e266fa6 (patch) | |
| tree | 79296a658ce68f34193393db902e227d8b5382d1 /sj2 | |
| parent | e0165dbb6223dfbac6e9c283720f405935240e40 (diff) | |
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
Diffstat (limited to 'sj2')
| -rw-r--r-- | sj2/util/makefile.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sj2/util/makefile.mk b/sj2/util/makefile.mk index d56e45efa08b..c12e351879cb 100644 --- a/sj2/util/makefile.mk +++ b/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 |