[Libreoffice-commits] .: testtools/com
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Jan 26 11:38:48 PST 2011
testtools/com/sun/star/comp/bridge/makefile.mk | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit a43431f730ebb7a547899b18d8daca8cc78ec757
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Jan 26 21:38:22 2011 +0200
Bypass this directory unless SOLAR_JAVA
diff --git a/testtools/com/sun/star/comp/bridge/makefile.mk b/testtools/com/sun/star/comp/bridge/makefile.mk
index 6f0129a..7083f23 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
-
-
More information about the Libreoffice-commits
mailing list