Better Makefile dependency map

chrisdolan · Feb 20, 2009 · 4c4df21 · 4c4df21
1 parent 020d701
commit 4c4df21
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ MERGEPBC  = $(PARROTDIR)/pbc_merge
 PCTDIR    = $(PARROTDIR)/runtime/parrot/library
 PCTPBC    = $(PCTDIR)/PCT.pbc
 PERL6DIR  = ../rakudo
-PERL6PBC  = $(PERL6DIR)/perl6.pbc
+PERL6PBC  = perl6.pbc
 ENV       = env PERL6LIB='./t:./lib:$(PCTDIR)'
 PERL6     = $(ENV) $(PARROT) $(PERL6PBC)
 CP        = $(PERL) -MExtUtils::Command -e cp
@@ -15,8 +15,8 @@ PIR       = $(PM:.pm=.pir)
 PBC       = $(PM:.pm=.pbc) $(T:.t=.pbc)
 
 all:    build
-build:	perk.pbc perl6.pbc
-perk.pir:	$(PIR) perk.pl
+build:	perk.pbc
+perk.pir:	$(PIR) perk.pl $(PERL6PBC)
 	$(PERL6) --target=pir --output=$@ perk.pl
 
 #perk.pbc:	perk.pir $(PERL6PBC) $(PCTPBC)
@@ -25,7 +25,7 @@ perk.pir:	$(PIR) perk.pl
 #	$(RM) perk_tmp.pbc
 
 # Copy perl6.pbc to the local dir because the inc path doesn't seem to work...
-perl6.pbc:	$(PERL6PBC)
+$(PERL6PBC):	$(PERL6DIR)/perl6.pbc Makefile
 	$(CP) $< $@
 
 test:	build
@@ -38,11 +38,11 @@ test-pir:	build
 	$(ENV) $(PERL) t/harness --target=pir
 
 clean:
-	$(RM) $(PIR) $(PBC) perk.pbc perk.pir
+	$(RM) $(PIR) $(PBC) perk.pbc perk.pir perl6.pbc
 
 %.pir:  %.pm $(PERL6PBC)
 	$(PERL6) --target=pir --output=$@ $<
-%.pbc:  %.pir
+%.pbc:  %.pir $(PARROT)
 	$(PARROT) -o $@ $<
 
 .PHONY: all check test test-parse test-pir test-past build clean