diff options
| author | David Ostrovsky <David.Ostrovsky@gmx.de> | 2012-05-26 09:50:26 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-29 07:35:43 +0200 |
| commit | 3379e91177f54405f234107ce077fbc769195cef (patch) | |
| tree | 7dcbd32771d248bf0dfb2975ca5129eefaa571d7 /testtools | |
| parent | 390c62238dfc913ffa2122728ddc6c3e2306e0b9 (diff) | |
fixed build error with --without-java parameter
Change-Id: Id383a2cd8bdaa14e6d991ee971a6b26230922b10
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/CustomTarget_bridgetest.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk index 4452c8e51f02..a4237d33ea7a 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) : \ |