From 708184d351c9fc312519502974a46eeaabb4291b Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Tue, 25 Jan 2005 14:10:12 +0000
Subject: INTEGRATION: CWS gcj1 (1.1.1.1.150); FILE MERGED 2004/12/02 10:06:07
 cmc 1.1.1.1.150.1: #i38188# This dir cannot be build fully with gcj

---
 sj2/stardiv/app/makefile.mk    |  9 +++++++--
 sj2/stardiv/applet/makefile.mk | 17 ++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'sj2')

diff --git a/sj2/stardiv/app/makefile.mk b/sj2/stardiv/app/makefile.mk
index aa0f441c0e73..d2eb21596826 100644
--- a/sj2/stardiv/app/makefile.mk
+++ b/sj2/stardiv/app/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:03 $
+#   last change: $Author: obo $ $Date: 2005-01-25 15:09:59 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -70,6 +70,10 @@ JARFILES=sandbox.jar
 
 .INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
+.IF "$(JDK)" == "gcj"
+all:
+        @echo This dir cannot be build with gcj because of sun.net.ftp.FtpClient
+.ELSE
 # --- Files --------------------------------------------------------
 
 JAVAFILES=  \
@@ -88,6 +92,7 @@ JAVACLASSFILES=	\
 
 
 # --- Targets ------------------------------------------------------
+.ENDIF
 
 .INCLUDE :  target.mk
 
diff --git a/sj2/stardiv/applet/makefile.mk b/sj2/stardiv/applet/makefile.mk
index 6adfa52db4e7..9fb1458c858a 100644
--- a/sj2/stardiv/applet/makefile.mk
+++ b/sj2/stardiv/applet/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:03 $
+#   last change: $Author: obo $ $Date: 2005-01-25 15:10:12 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -69,6 +69,11 @@ PACKAGE=stardiv$/applet
 
 .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 --------------------------------------------------------
 
 JARFILES= \
@@ -90,6 +95,7 @@ JAVACLASSFILES=	\
     $(CLASSDIR)$/$(PACKAGE)$/LiveConnectable.class			\
     $(CLASSDIR)$/$(PACKAGE)$/AppletExecutionContext.class
 
+.ENDIF
 
 #.IF "$(GUI)"=="WNT"
 #JAVACLASSFILES += $(CLASSDIR)$/stardiv$/applet$/WNativeAppletViewerFrame.class
@@ -101,10 +107,3 @@ JAVACLASSFILES=	\
 .INCLUDE :  target.mk
 
 .INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
-
-
-
-
-
-- 
cgit