aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorBrian Anderson <[email protected]>2011-03-06 19:27:16 -0500
committerGraydon Hoare <[email protected]>2011-03-14 15:52:48 -0700
commit242ecd0e96e568d80e20ad847a9a7766213cffee (patch)
treee9397b809dbd5dc22d8cf48f53de98aad7fe25d5 /src/Makefile
parentMake pretty-printer print 'with' clause in rec literals (diff)
downloadrust-242ecd0e96e568d80e20ad847a9a7766213cffee.tar.xz
rust-242ecd0e96e568d80e20ad847a9a7766213cffee.zip
Reorganize makefile targets
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile29
1 files changed, 8 insertions, 21 deletions
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