summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2016-06-28 23:34:28 -0400
committeryenatch <yenatch@gmail.com>2016-06-28 23:34:28 -0400
commitc52657d12e7742201ccf211fa50d491d4429aa6c (patch)
tree276bad49a046ca23a746f258a0110ee755d61216
parent68504441f044ca1273dbea50b7204bdfbb6564e1 (diff)
Fix a makefile bug where a missing dependency would cancel out a rule.
-rw-r--r--Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index fcfe3229f..fc8a8e9f9 100644
--- a/Makefile
+++ b/Makefile
@@ -106,18 +106,18 @@ src/%_sapphire.o: src/%.c
@printf ".text\n\t.align\t2, 0\n" >> src/$*_sapphire.s
$(AS) $(ASFLAGS) -o $@ src/$*_sapphire.s
-asm/%_ruby.o: dep = $(shell $(SCANINC) asm/$*.s)
-asm/%_sapphire.o: dep = $(shell $(SCANINC) asm/$*.s)
-asm/%_ruby.o: asm/%.s $$(dep)
+asm/%_ruby.o: $*_dep = $(shell $(SCANINC) asm/$*.s)
+asm/%_sapphire.o: $*_dep = $(shell $(SCANINC) asm/$*.s)
+asm/%_ruby.o: asm/%.s $$(%_dep)
$(AS) $(ASFLAGS) --defsym RUBY=1 -o $@ $<
-asm/%_sapphire.o: asm/%.s $$(dep)
+asm/%_sapphire.o: asm/%.s $$(%_dep)
$(AS) $(ASFLAGS) --defsym SAPPHIRE=1 -o $@ $<
-data/%_ruby.o: dep = $(shell $(SCANINC) data/$*.s)
-data/%_sapphire.o: dep = $(shell $(SCANINC) data/$*.s)
-data/%_ruby.o: data/%.s $$(dep)
+data/%_ruby.o: $*_dep = $(shell $(SCANINC) data/$*.s)
+data/%_sapphire.o: $*_dep = $(shell $(SCANINC) data/$*.s)
+data/%_ruby.o: data/%.s $$(%_dep)
$(PREPROC) $< charmap.txt | $(AS) $(ASFLAGS) --defsym RUBY=1 -o $@
-data/%_sapphire.o: data/%.s $$(dep)
+data/%_sapphire.o: data/%.s $$(%_dep)
$(PREPROC) $< charmap.txt | $(AS) $(ASFLAGS) --defsym SAPPHIRE=1 -o $@
ld_script_ruby.txt: ld_script.txt