From 6cc14b94cfe240047d1e234f92ac7b5edd4dcb6e Mon Sep 17 00:00:00 2001 From: sb Date: Tue, 9 Mar 2010 17:31:37 +0100 Subject: sb120: #i109978# removed --disable-qadevooo --- dbaccess/prj/build.lst | 2 +- dbaccess/qa/complex/dbaccess/makefile.mk | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/prj/build.lst b/dbaccess/prj/build.lst index 793ded483c3b..9cc0b4ab9ec4 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 d950100a7ead..56a24c0292fc 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)" == "" -- cgit