diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 12:38:51 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 12:38:51 +0000 |
| commit | b7ab6293f3b9bdded382cee82794c6a7410dbd1e (patch) | |
| tree | 678a2ab46feed2a2a895b1b9b315301d6f48c76a /jvmaccess/source | |
| parent | f55d83409ce861cc48a4dcdb368770f690c3784a (diff) | |
INTEGRATION: CWS geordi2q11 (1.4.42); FILE MERGED
2003/12/16 12:49:47 hr 1.4.42.1: #111934#: join CWS ooo111fix1
Diffstat (limited to 'jvmaccess/source')
| -rw-r--r-- | jvmaccess/source/makefile.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/jvmaccess/source/makefile.mk b/jvmaccess/source/makefile.mk index 8d4adb287..36a1e38a4 100644 --- a/jvmaccess/source/makefile.mk +++ b/jvmaccess/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: hr $ $Date: 2003-04-28 16:17:55 $ +# last change: $Author: vg $ $Date: 2003-12-17 13:38:51 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -67,6 +67,11 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE: settings.mk +.IF "$(SOLAR_JAVA)"=="" +nojava: + @echo "Not building jvmaccess because Java is disabled" +.ENDIF + UNOTYPES= com.sun.star.uno.TypeClass com.sun.star.uno.XInterface UNOUCRDEP = $(SOLARBINDIR)$/udkapi.rdb @@ -81,3 +86,4 @@ SLOFILES = \ $(SLO)$/windows.obj .INCLUDE: target.mk + |