summaryrefslogtreecommitdiff
path: root/RepositoryModule_ooo.mk
diff options
context:
space:
mode:
authorRene Engelhard <rene@debian.org>2011-12-30 16:01:28 +0100
committerRene Engelhard <rene@debian.org>2011-12-30 16:03:44 +0100
commit0f2d6f6323e93fa688cd00d0db683f81ccec8fd2 (patch)
treea33aa94f3b3b410c0608b7e3f4dd5c4dc249de1c /RepositoryModule_ooo.mk
parent4fd2b87dc4cc30de67fb26436ed9aee26b738368 (diff)
build qadevOOo only if SOLAR_JAVA and OOO_JUNIT_JAR are set
Diffstat (limited to 'RepositoryModule_ooo.mk')
-rw-r--r--RepositoryModule_ooo.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 947a06e0f1b5..d44e041e1a62 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
package \
padmin \
psprint_config \
- qadevOOo \
regexp \
reportdesign \
sal \
@@ -117,6 +116,14 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
xmlscript \
))
+ifneq ($(SOLAR_JAVA),)
+ ifneq "$(OOO_JUNIT_JAR)" ""
+$(eval $(call gb_Module_add_moduledirs,ooo,\
+ qadevOOo \
+))
+ endif
+endif
+
# these have only migrated subsequentcheck for now
$(eval $(call gb_Module_add_moduledirs,ooo,\
ucb \