summaryrefslogtreecommitdiff
path: root/jvmaccess/source
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-11-09 10:49:59 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-11-09 10:49:59 +0000
commit4ff64a323668c10071c28b6a9c81987ceab1ada2 (patch)
tree716fae7e85c479384bc172557bf8596485338bc7 /jvmaccess/source
parentb3bad513d7a35f4a7c4e79601c844fe8bb7d540a (diff)
INTEGRATION: CWS nojava1 (1.5.28); FILE MERGED
2004/09/24 14:34:58 haggai 1.5.28.3: RESYNC: (1.5-1.6); FILE MERGED 2004/08/16 15:20:48 cmc 1.5.28.2: #i33045# use normal -DSOLAR_JAVA 2004/08/16 14:21:41 cmc 1.5.28.1: #i33045# build jvmaccess even without java, just default to failure on javarelated stuff
Diffstat (limited to 'jvmaccess/source')
-rw-r--r--jvmaccess/source/makefile.mk9
1 files changed, 2 insertions, 7 deletions
diff --git a/jvmaccess/source/makefile.mk b/jvmaccess/source/makefile.mk
index f7483e81ae40..42c475655c5f 100644
--- a/jvmaccess/source/makefile.mk
+++ b/jvmaccess/source/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.6 $
+# $Revision: 1.7 $
#
-# last change: $Author: hr $ $Date: 2004-07-23 12:03:28 $
+# last change: $Author: hr $ $Date: 2004-11-09 11:49:59 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -67,11 +67,6 @@ 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