From 242ecd0e96e568d80e20ad847a9a7766213cffee Mon Sep 17 00:00:00 2001
From: Brian Anderson <andersrb@gmail.com>
Date: Sun, 6 Mar 2011 19:27:16 -0500
Subject: Reorganize makefile targets

---
 src/Makefile | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
index 24273835..6627a90d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -759,14 +759,13 @@ test/compile-fail/%.rustc.out.tmp: test/compile-fail/%.rs $(SREQ)
 	$(CFG_QUIET)grep --text --quiet \
       "$$(grep error-pattern $< | cut -d : -f 2- | tr -d '\n\r')" $@
 
-test/run-pass/%.boot$(CFG_EXE_SUFFIX): test/run-pass/%.rc $(BREQ)
-	@$(call CFG_ECHO, compile [boot]: $<)
-	$(BOOT) -o $@ $<
+%.bc: %.rc $(SREQ)
+	@$(call CFG_ECHO, compile [rustc]: $<)
+	$(RUSTC) -o $@ $<
 
-test/bench/shootout/%.boot$(CFG_EXE_SUFFIX): \
-  test/bench/shootout/%.rs $(BREQ)
-	@$(call CFG_ECHO, compile [boot]: $<)
-	$(BOOT) -o $@ $<
+%.bc: %.rs $(SREQ)
+	@$(call CFG_ECHO, compile [rustc]: $<)
+	$(RUSTC) -o $@ $<
 
 %.ll: %.bc
 	@$(call CFG_ECHO, dis [llvm]: $<)
@@ -789,26 +788,14 @@ test/bench/shootout/%.boot$(CFG_EXE_SUFFIX): \
 	@# programs, I\'ll live with the noise.
 	-$(CFG_QUIET)$(DSYMUTIL) $@
 
-test/run-pass/%.bc: test/run-pass/%.rc $(SREQ)
-	@$(call CFG_ECHO, compile [rustc]: $<)
-	$(RUSTC) -o $@ $<
-
-test/run-pass/%.boot$(CFG_EXE_SUFFIX): test/run-pass/%.rs $(BREQ)
+%.boot$(CFG_EXE_SUFFIX): %.rs $(BREQ)
 	@$(call CFG_ECHO, compile [boot]: $<)
 	$(BOOT) -o $@ $<
 
-test/run-pass/%.bc: test/run-pass/%.rs $(SREQ)
-	@$(call CFG_ECHO, compile [rustc]: $<)
-	$(RUSTC) -o $@ $<
-
-test/run-fail/%.boot$(CFG_EXE_SUFFIX): test/run-fail/%.rs $(BREQ)
+%.boot$(CFG_EXE_SUFFIX): %.rc $(BREQ)
 	@$(call CFG_ECHO, compile [boot]: $<)
 	$(BOOT) -o $@ $<
 
-test/run-fail/%.bc: test/run-fail/%.rs $(SREQ)
-	@$(call CFG_ECHO, compile [rustc]: $<)
-	$(RUSTC) -o $@ $<
-
 
 ######################################################################
 # Auto-dependency
-- 
cgit v1.2.3