summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-03-07 14:53:10 +0100
committerJan Holesovsky <kendy@suse.cz>2011-03-07 14:53:10 +0100
commitecb752357d7bbbfe04f9fc12adec4d638099e48e (patch)
treeb24292a67b3e8e30486883d23150a749b280dfdd
parentf3a6a065ed956cadfd6a248f18297a5512542752 (diff)
Fix build --without-java in 'desktop'.
-rw-r--r--desktop/test/deployment/active/makefile.mk7
-rw-r--r--desktop/test/deployment/passive/makefile.mk7
2 files changed, 14 insertions, 0 deletions
diff --git a/desktop/test/deployment/active/makefile.mk b/desktop/test/deployment/active/makefile.mk
index 5511a39c8b..71f24e73c5 100644
--- a/desktop/test/deployment/active/makefile.mk
+++ b/desktop/test/deployment/active/makefile.mk
@@ -29,6 +29,8 @@ PRJ = ../../..
PRJNAME = desktop
TARGET = test_deployment_active
+.IF "$(SOLAR_JAVA)" != ""
+
ENABLE_EXCEPTIONS = TRUE
PACKAGE = com/sun/star/comp/test/deployment/active_java
@@ -81,3 +83,8 @@ $(MISC)/$(TARGET)/active_java.jar : MANIFEST.MF $(JAVATARGET)
$(MISC)/$(TARGET)/active_java.jar-zip/$(PACKAGE)/
cd $(MISC)/$(TARGET)/active_java.jar-zip && zip ../active_java.jar \
META-INF/MANIFEST.MF $(foreach,i,$(JAVAFILES:b) $(PACKAGE)/$i.class)
+
+.ELSE # no java
+ALLTAR :
+ @echo "Java disabled, not creating active.oxt."
+.ENDIF
diff --git a/desktop/test/deployment/passive/makefile.mk b/desktop/test/deployment/passive/makefile.mk
index 019e5dcab8..7123a79da0 100644
--- a/desktop/test/deployment/passive/makefile.mk
+++ b/desktop/test/deployment/passive/makefile.mk
@@ -29,6 +29,8 @@ PRJ = ../../..
PRJNAME = desktop
TARGET = test_deployment_passive
+.IF "$(SOLAR_JAVA)" != ""
+
ENABLE_EXCEPTIONS = TRUE
PACKAGE = com/sun/star/comp/test/deployment/passive_java
@@ -134,3 +136,8 @@ $(MISC)/$(TARGET)/passive_java.jar : MANIFEST.MF $(JAVATARGET)
$(MISC)/$(TARGET)/passive_java.jar-zip/$(PACKAGE)/
cd $(MISC)/$(TARGET)/passive_java.jar-zip && zip ../passive_java.jar \
META-INF/MANIFEST.MF $(foreach,i,$(JAVAFILES:b) $(PACKAGE)/$i.class)
+
+.ELSE # no java
+ALLTAR :
+ @echo "Java disabled, not creating passive.oxt."
+.ENDIF