1 files changed, 82 insertions, 44 deletions
diff --git a/toolkit/qa/complex/toolkit/makefile.mk b/toolkit/qa/complex/toolkit/makefile.mk
index 3a4e096719bb..70918d602624 100755
--- a/toolkit/qa/complex/toolkit/makefile.mk
+++ b/toolkit/qa/complex/toolkit/makefile.mk
@@ -25,58 +25,96 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = Toolkit
-PRJNAME = $(TARGET)
-PACKAGE = complex$/toolkit
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar 
-JAVAFILES       = CheckAccessibleStatusBar.java CheckAccessibleStatusBarItem.java CheckAsyncCallback.java CallbackClass.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-SUBDIRS		= interface_tests
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-# --- Parameters for the test --------------------------------------
+PRJ = ../../..
+PRJNAME = toolkit
+TARGET = qa_complex_toolkit
 
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/toolkit
 
-# test base is java complex
-CT_TESTBASE = -tb java_complex
+JAVATESTFILES       = CheckAccessibleStatusBar.java \
+    CheckAccessibleStatusBarItem.java \
+    CheckAsyncCallback.java \
+    CallbackClass.java
 
-# build up package name with "." instead of $/
-CT_PACKAGE     = -o $(PACKAGE:s\$/\.\)
+JAVAFILES = $(JAVATESTFILES) \
+ _XAccessibleComponent.java \
+ _XAccessibleContext.java \
+ _XAccessibleEventBroadcaster.java \
+ _XAccessibleExtendedComponent.java \
+ _XAccessibleText.java \
+ _XRequestCallback.java
 
-# start the runner application
-CT_APP      = org.openoffice.Runner
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-# --- Targets ------------------------------------------------------
+.END
 
-.INCLUDE :  target.mk
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-run: \
-    CheckAccessibleStatusBarItem
+ALLTAR : javatest
 
-CheckAccessibleStatusBar:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_PACKAGE).CheckAccessibleStatusBar
+.END
 
-CheckAccessibleStatusBarItem:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_PACKAGE).CheckAccessibleStatusBarItem
 
+# PRJ = ..$/..$/..
+# TARGET  = Toolkit
+# PRJNAME = $(TARGET)
+# PACKAGE = complex$/toolkit
+# 
+# # --- Settings -----------------------------------------------------
+# .INCLUDE: settings.mk
+# 
+# 
+# #----- compile .java files -----------------------------------------
+# 
+# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar 
+# JAVAFILES       = CheckAccessibleStatusBar.java CheckAccessibleStatusBarItem.java CheckAsyncCallback.java CallbackClass.java
+# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+# SUBDIRS		= interface_tests
+# 
+# #----- make a jar from compiled files ------------------------------
+# 
+# MAXLINELENGTH = 100000
+# 
+# JARCLASSDIRS    = $(PACKAGE)
+# JARTARGET       = $(TARGET).jar
+# JARCOMPRESS 	= TRUE
+# 
+# # --- Parameters for the test --------------------------------------
+# 
+# # start an office if the parameter is set for the makefile
+# .IF "$(OFFICE)" == ""
+# CT_APPEXECCOMMAND =
+# .ELSE
+# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
+# .ENDIF
+# 
+# # test base is java complex
+# CT_TESTBASE = -tb java_complex
+# 
+# # build up package name with "." instead of $/
+# CT_PACKAGE     = -o $(PACKAGE:s\$/\.\)
+# 
+# # start the runner application
+# CT_APP      = org.openoffice.Runner
+# 
+# # --- Targets ------------------------------------------------------
+# 
+# .INCLUDE :  target.mk
+# 
+# run: \
+#     CheckAccessibleStatusBarItem
+# 
+# CheckAccessibleStatusBar:
+#     +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_PACKAGE).CheckAccessibleStatusBar
+# 
+# CheckAccessibleStatusBarItem:
+#     +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_PACKAGE).CheckAccessibleStatusBarItem
+#