[Libreoffice-commits] .: Branch 'feature/gbuild_merge' - testtools/CustomTarget_bridgetest.mk

[David Ostrovsky]

 testtools/CustomTarget_bridgetest.mk |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit b17a8fb79f44327fbb30be8301029c15a6962aa4
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date:   Sat May 26 09:50:26 2012 +0200

    fixed build error with --without-java parameter
    
    Change-Id: Id383a2cd8bdaa14e6d991ee971a6b26230922b10

diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk
index 4452c8e..a4237d3 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -37,11 +37,16 @@ BATCH_SUFFIX :=
 GIVE_EXEC_RIGHTS=chmod +x
 endif
 
-$(call gb_CustomTarget_get_target,testtools/bridgetest) : \
-	$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \
+bridgetest_TARGET := $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \
+	$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX)
+
+ifneq ($(SOLAR_JAVA),)
+bridgetest_TARGET := $(bridgetest_TARGET) \
 	$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) \
-	$(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) \
-	$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) \
+	$(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX)
+endif
+
+$(call gb_CustomTarget_get_target,testtools/bridgetest) : $(bridgetest_TARGET)
 
 # which other prerequisites do we need here?
 $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \