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

[Alkis Evlogimenos]

Changes in directory llvm-java/test:

Makefile.test updated: 1.35 -> 1.36
---
Log message:

Move common rules out of the ifdef.


---
Diffs of the changes:  (+10 -10)

 Makefile.test |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)


Index: llvm-java/test/Makefile.test
diff -u llvm-java/test/Makefile.test:1.35 llvm-java/test/Makefile.test:1.36
--- llvm-java/test/Makefile.test:1.35	Mon Jan 17 11:33:59 2005
+++ llvm-java/test/Makefile.test	Tue Jan 25 10:01:52 2005
@@ -17,6 +17,16 @@
 # intermediate results
 .PRECIOUS: %.linked.bc %.raw.bc %.ll %.llvm.bc
 
+# rule to link bytecode with runtime
+%.llvm %.llvm.bc: %.linked.bc $(LibDir)/libjrt.bca $(EXTRA_OBJS) $(LOPT)
+	$(Echo) Linking $< with the Java runtime
+	-$(Verb)$(GCCLD) -o=$*.llvm $< -L $(CFERuntimeLibDir) -L $(LibDir) $(EXTRA_OBJS)
+
+# rule to make assembly from bytecode
+%.dis-ll: %.bc
+	$(Echo) Disassembling $<
+	$(Verb)$(LDIS) -f -o=$@ $<
+
 # rule to compile java sources
 ifdef BUILD_JAVA_SOURCES
 JAVA_SOURCES := $(wildcard *.java)
@@ -58,16 +68,6 @@
 	&& echo "PASS: $(notdir $*)" \
 	|| echo "FAIL: $(notdir $*)"
 
-# rule to link bytecode with runtime
-%.llvm %.llvm.bc: %.linked.bc $(LibDir)/libjrt.bca $(EXTRA_OBJS) $(LOPT)
-	$(Echo) Linking $< with the Java runtime
-	-$(Verb)$(GCCLD) -o=$*.llvm $< -L $(CFERuntimeLibDir) -L $(LibDir) $(EXTRA_OBJS)
-
-# rule to make assembly from bytecode
-%.dis-ll: %.bc
-	$(Echo) Disassembling $<
-	$(Verb)$(LDIS) -f -o=$@ $<
-
 all-local:: $(DIFFS)
 
 endif