summaryrefslogtreecommitdiff
path: root/sj2
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-01-25 14:10:25 +0000
committerOliver Bolte <obo@openoffice.org>2005-01-25 14:10:25 +0000
commitedc487eb9616ebdd69f87d72ccfb584189587a76 (patch)
treebd998177e0bc8de6892bfec14f6d5e34b151b284 /sj2
parent708184d351c9fc312519502974a46eeaabb4291b (diff)
INTEGRATION: CWS gcj1 (1.1.1.1.150); FILE MERGED
2004/12/02 10:06:08 cmc 1.1.1.1.150.1: #i38188# This dir cannot be build fully with gcj
Diffstat (limited to 'sj2')
-rw-r--r--sj2/stardiv/controller/makefile.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/sj2/stardiv/controller/makefile.mk b/sj2/stardiv/controller/makefile.mk
index 6a2b2402cf1a..d916ca13b458 100644
--- a/sj2/stardiv/controller/makefile.mk
+++ b/sj2/stardiv/controller/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.1.1.1 $
+# $Revision: 1.2 $
#
-# last change: $Author: hr $ $Date: 2000-09-18 16:54:04 $
+# last change: $Author: obo $ $Date: 2005-01-25 15:10:25 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -70,6 +70,11 @@ JARFILES=sandbox.jar tkt.jar
.INCLUDE : $(PRJ)$/util$/makefile.pmk
+.IF "$(JDK)" == "gcj"
+all:
+ @echo This dir cannot be build with gcj because of com.sun.star.lib.sandbox.ResourceProxy
+.ELSE
+
# --- Files --------------------------------------------------------
JAVAFILES= \
@@ -95,6 +100,7 @@ JAVACLASSFILES= \
$(CLASSDIR)$/$(PACKAGE)$/PropertyEditor.class
# --- Targets ------------------------------------------------------
+.ENDIF
.INCLUDE : target.mk