diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 14:42:32 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 14:42:32 +0000 |
| commit | e08e4d61fb0b8f4168c1cf016e19935874f9a894 (patch) | |
| tree | 3705f7265daa412e32a79cc4946f9dfa1b23c6e3 /javaunohelper/source | |
| parent | 1774a38c243f9dc6d101396935f7cb7ca573d492 (diff) | |
INTEGRATION: CWS geordi2q11 (1.12.40); FILE MERGED
2003/12/16 12:46:35 hr 1.12.40.1: #111934#: join CWS ooo111fix1
Diffstat (limited to 'javaunohelper/source')
| -rw-r--r-- | javaunohelper/source/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/javaunohelper/source/makefile.mk b/javaunohelper/source/makefile.mk index e0531d492c5e..6d20e8e8ec79 100644 --- a/javaunohelper/source/makefile.mk +++ b/javaunohelper/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: vg $ $Date: 2003-04-15 13:40:17 $ +# last change: $Author: vg $ $Date: 2003-12-17 15:42:32 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -59,6 +59,7 @@ # # #************************************************************************* + PRJ=.. PRJNAME=javaunohelper @@ -74,6 +75,11 @@ LIBTARGET=NO .INCLUDE : settings.mk .INCLUDE : sv.mk +.IF "$(SOLAR_JAVA)"=="" +nojava: + @echo "Not building javaunohelper because Java is disabled" +.ENDIF + # ------------------------------------------------------------------ UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb @@ -156,3 +162,4 @@ DEF2NAME=$(SHL2TARGET) # --- Targets ------------------------------------------------------ .INCLUDE : target.mk + |