From 42fc25bc9d94903f545531344fb04da27001a72e Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Wed, 26 Jan 2011 21:38:22 +0200
Subject: Bypass this directory unless SOLAR_JAVA

---
 testtools/com/sun/star/comp/bridge/makefile.mk | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'testtools')

diff --git a/testtools/com/sun/star/comp/bridge/makefile.mk b/testtools/com/sun/star/comp/bridge/makefile.mk
index 6f0129ac7b48..7083f2381698 100644
--- a/testtools/com/sun/star/comp/bridge/makefile.mk
+++ b/testtools/com/sun/star/comp/bridge/makefile.mk
@@ -30,17 +30,16 @@ PRJNAME=testtools
 PACKAGE=com$/sun$/star$/comp$/bridge
 TARGET=com_sun_star_comp_bridge
 
-
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
 
 # ------------------------------------------------------------------
 
+.IF "$(SOLAR_JAVA)" != ""
 
 JARFILES 		= ridl.jar jurt.jar juh.jar
 
-
 JAVACLASSFILES= \
     $(CLASSDIR)$/$(PACKAGE)$/CurrentContextChecker.class \
     $(CLASSDIR)$/$(PACKAGE)$/TestComponent.class \
@@ -48,14 +47,13 @@ JAVACLASSFILES= \
 
 JAVAFILES		= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
 
-
 JARCLASSDIRS	= $(PACKAGE) test$/testtools$/bridgetest
 JARTARGET		= testComponent.jar
 JARCOMPRESS 	= TRUE
 CUSTOMMANIFESTFILE = manifest
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
-
-
-- 
cgit