[Libreoffice-commits] core.git: smoketest/Module_smoketest.mk

[Stephan Bergmann]

 smoketest/Module_smoketest.mk |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 94fdd5d302e34220a0b1beaf3610658d15c7b808
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue May 7 17:25:44 2013 +0200

    Exempt smoketest.jar from "non-cross-compiling only"
    
    ...just like it was implicitly exempted while it was still part of juh.jar.
    (The true fix should be to remove this smoketest-support code from general
    installation sets, but that is left as an exercise for another day.)
    
    Change-Id: Ia8bb07795facef5f344e3e53c3901f229725d1af

diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index 70f2a3e..30ed698 100644
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -23,7 +23,6 @@ ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,smoketest,\
 	Extension_TestExtension \
 	Jar_TestExtension \
-	Jar_smoketest \
 ))
 endif
 
@@ -39,4 +38,10 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,smoketest,\
 
 endif
 
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Module_add_targets,smoketest,\
+	Jar_smoketest \
+))
+endif
+
 # vim: set noet sw=4 ts=4: