Refactor checks for Makefile updates so that 'make realclean' continu…

…es to work.
rakudo · Apr 7, 2009 · 4453712 · 4453712
1 parent 27f0c01
commit 4453712
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/build/Makefile.in b/build/Makefile.in
@@ -179,7 +179,7 @@ perl6.pbc: perl6_s1.pbc src/gen_setting.pm
 	$(PARROT) $(PARROT_ARGS) -o perl6.pbc perl6.pir
 
 # the Perl 6 stage-1 compiler
-perl6_s1.pbc: $(PARROT) $(SOURCES) $(BUILTINS_PIR)
+perl6_s1.pbc: makefilecheck $(PARROT) $(SOURCES) $(BUILTINS_PIR)
 	$(PERL) -e "" > src/gen_setting.pir
 	$(PARROT) $(PARROT_ARGS) -o perl6_s1.pbc perl6.pir
 
@@ -192,7 +192,7 @@ src/gen_actions.pir: $(PARROT) $(NQP) $(PCT) src/parser/actions.pm
 	$(PARROT) $(PARROT_ARGS) $(NQP) --output=src/gen_actions.pir \
 	    --encoding=fixed_8 --target=pir src/parser/actions.pm
 
-src/gen_builtins.pir: build/gen_builtins_pir.pl Makefile
+src/gen_builtins.pir: makefilecheck build/gen_builtins_pir.pl
 	$(PERL) build/gen_builtins_pir.pl $(BUILTINS_PIR) > src/gen_builtins.pir
 
 src/gen_metaop.pir: build/gen_metaop_pir.pl
@@ -201,10 +201,10 @@ src/gen_metaop.pir: build/gen_metaop_pir.pl
 src/gen_junction.pir: build/gen_junction_pir.pl
 	$(PERL) build/gen_junction_pir.pl src/gen_junction.pir
 
-src/gen_setting.pm: build/gen_setting_pm.pl $(SETTING)
+src/gen_setting.pm: makefilecheck build/gen_setting_pm.pl $(SETTING)
 	$(PERL) build/gen_setting_pm.pl $(SETTING) > src/gen_setting.pm
 
-$(PERL6_GROUP): $(PARROT) $(PMC_SOURCES)
+$(PERL6_GROUP): makefilecheck $(PARROT) $(PMC_SOURCES)
 	cd $(PMC_DIR) && $(BUILD_DYNPMC) generate $(PMCS)
 	cd $(PMC_DIR) && $(BUILD_DYNPMC) compile $(PMCS)
 	cd $(PMC_DIR) && $(BUILD_DYNPMC) linklibs $(PMCS)
@@ -323,9 +323,8 @@ help:
 	@echo "  help:              Print this help message."
 	@echo ""
 
-Makefile: build/Makefile.in
-	@echo "Makefile is out of date... try re-running Configure.pl"
-	@$(PERL) -e 'exit 1' 
+makefilecheck: Makefile
+	@$(PERL) -e 'die "Makefile is out of date... try re-running Configure.pl\n" if (-M "build/Makefile.in" < -M "Makefile");'
 
 CRITIC_FILES=Configure.pl t/harness build/ tools/