[llvm-commits] CVS: llvm-java/test/Makefile.test

[Alkis Evlogimenos]

Changes in directory llvm-java/test:

Makefile.test updated: 1.16 -> 1.17
---
Log message:

Update rules to work with new tool names.


---
Diffs of the changes:  (+19 -11)

Index: llvm-java/test/Makefile.test
diff -u llvm-java/test/Makefile.test:1.16 llvm-java/test/Makefile.test:1.17
--- llvm-java/test/Makefile.test:1.16	Sat Oct 30 07:52:30 2004
+++ llvm-java/test/Makefile.test	Wed Nov 24 03:01:42 2004
@@ -17,23 +17,31 @@
 
 # we don't want these files to be deleted by make, even if they are
 # intermediate results
-.PRECIOUS: Output/.dir Output/%.class %.bc %.ll %.llvm.bc %.llvm
+.SECONDARY: Output/.dir %.linked.bc %.raw.bc %.ll %.llvm.bc
 
 #rule to link in runtime to raw bytecode
-%.linked.bc: %.raw.bc $(DESTLIBBYTECODE)/libjrt.bc
+%.linked.bc: %.raw.bc $(LibDir)/libjrt.bc $(EXTRA_OBJS)
 	$(Echo) Linking $< with the Java runtime
-	$(Verb)$(LLVMTOOLCURRENT)/llvm-link$(EXEEXT) $^ -o - | \
-	$(Verb)$(LOPT) -simplifycfg -mem2reg -instcombine > $@
+	$(Verb)$(LLINK) $^ -o=$@
+
+# rule to optimize the linked bytecode
+%.llvm.bc: %.linked.bc $(LOPT)
+	$(Echo) Optimizing $<
+	$(Verb)$(LOPT) -simplifycfg -mem2reg -instcombine -f -o=$@ $<
 
 # rule to make assembly from bytecode
 %.dis-ll: %.bc
-	$(ECHO) Disassembling $<
-	$(Verb)$(LDIS) < $< > $@
+	$(Echo) Disassembling $<
+	$(Verb)$(LDIS) -f -o=$@ $<
 
-# rule to compile java source
-Output/%.class: %.java Output/.dir
-	$(ECHO) Compiling $<
-	$(Verb)$(JAVAC) -d Output $<
+# rule to compile java sources
+ifdef JAVA_TESTS
+Output/.compile-java: $(addsuffix .java,$(JAVA_TESTS))
+	$(Echo) Compiling $?
+	$(Verb)mkdir -p Output
+	$(Verb)$(JAVAC) -d Output $?
+	$(Verb)touch $@
+endif
 
 # rule to run a .class file with the jvm
 %.out-nat: %.class
@@ -41,4 +49,4 @@
 
 # rule to run a .class file with the llvm jit
 %.out-jit: %.llvm.bc
-	$(Verb)$(LLI) $< > $*.out-nat || rm -f $*.out-nat
+	$(Verb)$(LLI) $< > $*.out-jit