summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-03-15 08:21:23 +0000
committerOliver Bolte <obo@openoffice.org>2005-03-15 08:21:23 +0000
commit5f9c5af18e6c0f158cd0c4155906ea5336e5d706 (patch)
treee599061fe9e37a30278a482cec5d74e502c1a257
parent276f0b2dab1a6f8b284404b210b2389fe090600e (diff)
INTEGRATION: CWS gcj3 (1.8.10); FILE MERGED
2005/03/08 19:18:39 cmc 1.8.10.1: #i44359# more of qadevOOo now compilable with gcj
-rw-r--r--qadevOOo/runner/makefile.mk10
1 files changed, 3 insertions, 7 deletions
diff --git a/qadevOOo/runner/makefile.mk b/qadevOOo/runner/makefile.mk
index dd5218f9ef80..29f24f747cb3 100644
--- a/qadevOOo/runner/makefile.mk
+++ b/qadevOOo/runner/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.9 $
#
-# last change: $Date: 2005-01-25 15:39:17 $
+# last change: $Date: 2005-03-15 09:21:23 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -69,11 +69,7 @@ TARGET = $(PRJNAME)
SUBDIRS_TESTS = mod ifc
SUBDIRS_RUNNER = util share stats lib complexlib helper basicrunner \
- base org$/openoffice
-
-.IF "$(JDK)" != "gcj"
-SUBDIRS_RUNNER += convwatch
-.ENDIF
+ base org$/openoffice convwatch
JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)