1 files changed, 24 insertions, 17 deletions
diff --git a/sfx2/qa/complex/docinfo/makefile.mk b/sfx2/qa/complex/docinfo/makefile.mk
index 8c35255410..626b648a6d 100644
--- a/sfx2/qa/complex/docinfo/makefile.mk
+++ b/sfx2/qa/complex/docinfo/makefile.mk
@@ -25,32 +25,39 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = DocumentProperties
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
+
+PRJ = ../../..
 PRJNAME = sfx2
-PACKAGE = complex$/docinfo
+TARGET = qa_complex_docinfo
 
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/docinfo
+JAVATESTFILES = \
+    DocumentProperties.java
+
+JAVAFILES = $(JAVATESTFILES)
 
 
-#----- compile .java files -----------------------------------------
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = DocumentProperties.java
+# Sample how to debug
+# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
+
+.END
+
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-#----- make a jar from compiled files ------------------------------
+ALLTAR : javatest
 
-MAXLINELENGTH = 100000
+.END
 
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
 
-# --- Targets ------------------------------------------------------
 
-.INCLUDE :  target.mk
 
 
-run:
-    $(JAVAI) $(JAVAIFLAGS) -cp $(CLASSPATH) org.openoffice.Runner -TestBase java_complex -o $(PACKAGE:s#$/#.#).$(JAVAFILES:b)