summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-01-26 21:38:22 +0200
committerTor Lillqvist <tlillqvist@novell.com>2011-01-26 21:38:22 +0200
commita43431f730ebb7a547899b18d8daca8cc78ec757 (patch)
tree87c5381291d28321f0ad26bc5b6281cca8acc107
parent31562da266c3b71127950f4b9d689dc00db596ce (diff)
Bypass this directory unless SOLAR_JAVALO-BASE-INTEGRATION-DEV300_m98
-rw-r--r--testtools/com/sun/star/comp/bridge/makefile.mk8
1 files changed, 3 insertions, 5 deletions
diff --git a/testtools/com/sun/star/comp/bridge/makefile.mk b/testtools/com/sun/star/comp/bridge/makefile.mk
index 6f0129ac7..7083f2381 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
-
-