summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Engelhard <rene@openoffice.org>2008-12-04 14:39:15 +0000
committerRené Engelhard <rene@openoffice.org>2008-12-04 14:39:15 +0000
commit6ec5c10ab15b22ff83001858653b79467af0234d (patch)
treef6726fcc9a5e8597f598f2e77f56b1472054ae09
parenta092036331afce1bb826c4318b0e9a33b2a8e234 (diff)
#i96896 # fix --disable-qadevooo build
-rw-r--r--connectivity/prj/build.lst2
-rw-r--r--connectivity/qa/connectivity/tools/makefile.mk3
2 files changed, 4 insertions, 1 deletions
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index b996edfeadb8..409abb250c02 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,4 +1,4 @@
-cn connectivity : comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb NULL
+cn connectivity : comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo NULL
cn connectivity usr1 - all cn_mkout NULL
cn connectivity\inc nmake - all cn_inc NULL
cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL
diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk
index c85d5ddd5465..589a85ea385f 100644
--- a/connectivity/qa/connectivity/tools/makefile.mk
+++ b/connectivity/qa/connectivity/tools/makefile.mk
@@ -42,6 +42,7 @@ all:
@echo "Java not available. Build skipped"
.ELSE
+.IF "$(BUILD_QADEVOOO)" == "YES"
#----- compile .java files -----------------------------------------
JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar
@@ -70,6 +71,8 @@ ALL : ALLTAR
ALL: ALLDEP
.ENDIF
+.ENDIF
+
.ENDIF # "$(SOLAR_JAVA)" == ""
.INCLUDE : target.mk