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

[Alkis Evlogimenos]

Changes in directory llvm-java/test:

Makefile.test updated: 1.27 -> 1.28
---
Log message:

Update makefiles to better describe dependancies between files.


---
Diffs of the changes:  (+5 -7)

Index: llvm-java/test/Makefile.test
diff -u llvm-java/test/Makefile.test:1.27 llvm-java/test/Makefile.test:1.28
--- llvm-java/test/Makefile.test:1.27	Thu Dec  9 13:21:23 2004
+++ llvm-java/test/Makefile.test	Sun Dec 12 22:45:50 2004
@@ -33,17 +33,15 @@
 
 # rule to compile java sources
 ifdef JAVA_TESTS
-Output/.compile-java: $(addsuffix .java,$(JAVA_TESTS))
+PREFIXED_JAVA_TESTS := $(addprefix Output/, $(JAVA_TESTS))
+PREFIXED_CLASS_FILES := $(addsuffix .class/, $(PREFIXED_JAVA_TESTS))
+
+$(PREFIXED_CLASS_FILES): $(addsuffix .java,$(JAVA_TESTS))
 	$(Echo) Compiling $?
 	$(Verb)mkdir -p Output
 	$(Verb)$(JAVAC) -d Output $?
 	$(Verb)touch $@
 
-all:: Output/.compile-java
-endif
-
-PREFIXED_JAVA_TESTS := $(addprefix Output/, $(JAVA_TESTS))
-
 # Compiled bytecode for tests
 BYTECODE := $(addsuffix .llvm.bc, $(PREFIXED_JAVA_TESTS))
 
@@ -57,7 +55,6 @@
 # Keep the output and diffs
 .PRECIOUS: %.out-nat %.out-jit %.diff
 
-all:: $(BYTECODE)
 all:: $(DIFFS)
 
 # rule to run a .class file with the jvm
@@ -74,3 +71,4 @@
 	$(Verb)diff $*.out-nat $*.out-jit > $@ \
 	&& echo "PASS: $(notdir $*)" \
 	|| echo "FAIL: $(notdir $*)"
+endif