From d388db8d412d4e6ac26c6d0cb1d6cd90af47feb0 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@sun.com>
Date: Thu, 30 Sep 2010 13:10:28 +0200
Subject: dba34b: tweaked the makefile

---
 forms/qa/makefile.mk | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'forms')

diff --git a/forms/qa/makefile.mk b/forms/qa/makefile.mk
index afafcca427aa..b19f7864c2b1 100644
--- a/forms/qa/makefile.mk
+++ b/forms/qa/makefile.mk
@@ -66,14 +66,11 @@ ALL: 	ALLDEP
 
 .INCLUDE :  target.mk
 
-test:
-    echo $(SOLARBINDIR)
-
-show_targets:
+show_targets: $(CLASSDIR)$/$(JARTARGET)
     +@$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//))
 
-run:
-    +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce forms_all.sce
+run: $(CLASSDIR)$/$(JARTARGET)
+    +$(COPY) integration$/forms$/*.props $(CLASSDIR) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce forms_all.sce
 
-run_%:
-    +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o integration.$(PRJNAME).$(@:s/run_//)
+run_%: $(CLASSDIR)$/$(JARTARGET)
+    +$(COPY) integration$/forms$/*.props $(CLASSDIR) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o integration.$(PRJNAME).$(@:s/run_//)
-- 
cgit