summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dbaccess/prj/build.lst2
-rwxr-xr-xdbaccess/qa/complex/dbaccess/makefile.mk5
2 files changed, 1 insertions, 6 deletions
diff --git a/dbaccess/prj/build.lst b/dbaccess/prj/build.lst
index d5c6eacc7..f8b050257 100644
--- a/dbaccess/prj/build.lst
+++ b/dbaccess/prj/build.lst
@@ -1,4 +1,4 @@
-ba dbaccess : l10n BOOST:boost connectivity svx stoc QADEVOOO:qadevOOo xmlscript NULL
+ba dbaccess : l10n BOOST:boost connectivity svx stoc qadevOOo xmlscript NULL
ba dbaccess usr1 - all ba_mkout NULL
ba dbaccess\inc nmake - all ba_inc NULL
ba dbaccess\source\ui\inc nmake - all ba_uiinc ba_inc NULL
diff --git a/dbaccess/qa/complex/dbaccess/makefile.mk b/dbaccess/qa/complex/dbaccess/makefile.mk
index d950100a7..56a24c029 100755
--- a/dbaccess/qa/complex/dbaccess/makefile.mk
+++ b/dbaccess/qa/complex/dbaccess/makefile.mk
@@ -40,7 +40,6 @@ all:
.INCLUDE : target.mk
.ELSE
-.IF "$(BUILD_QADEVOOO)" == "YES"
#----- compile .java files -----------------------------------------
JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar ConnectivityTools.jar
@@ -76,8 +75,4 @@ run: $(CLASSDIR)$/$(JARTARGET)
run_%: $(CLASSDIR)$/$(JARTARGET)
+$(RUNNER_CALL) $(RUNNER_ARGS) -o complex.dbaccess.$(@:s/run_//)
-.ELSE
-.INCLUDE : target.mk
-.ENDIF # "$(BUILD_QADEVOOO)" == "YES"
-
.ENDIF # "$(SOLAR_JAVA)" == ""