diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-26 21:38:22 +0200 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-26 21:38:22 +0200 |
commit | 42fc25bc9d94903f545531344fb04da27001a72e (patch) | |
tree | 3dfb53a48d3496a8ec50429f72b6310e83830799 /testtools | |
parent | 9ce17b8c0adfd7c06c66a83ccd51043b8ffa42a0 (diff) |
Bypass this directory unless SOLAR_JAVA
Notes
Notes:
split repo tag: testing_LO-BASE-INTEGRATION-DEV300_m98
Diffstat (limited to 'testtools')
-rw-r--r-- | testtools/com/sun/star/comp/bridge/makefile.mk | 8 |
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 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 - - |