X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=129adfc4d54bd5d70a93c5746a312fd37671ff2e;hb=bb7ffa1642e2110e26e1243c42a8a24adafa985d;hp=3e2ae8d988eb4de7788280da3a97e4c684af9ff2;hpb=5b9164b417bd96a629adb0998796e2f9d2d5d22f;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 3e2ae8d..129adfc 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -40,6 +40,8 @@ PRIMOP_BITS = primop-data-decl.hs-incl        \
               primop-strictness.hs-incl       \
               primop-primop-info.hs-incl
 
+boot:: boot.stage.$(stage)
+
 all:: build.stage.$(stage)
 
 stage1 ::
@@ -160,7 +162,7 @@ CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
 
-build.stage.%: $(PRIMOP_BITS)
+boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) parser/Parser.y
 	$(CABAL) configure --distpref dist-stage$* \
 	                   $(CONFIGURE_FLAGS_STAGE$*) \
 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
@@ -168,9 +170,15 @@ build.stage.%: $(PRIMOP_BITS)
 	                   --ghc-option=-DSTAGE=$*
 	$(RM) -f Makefile-stage$*
 	$(CABAL) makefile  --distpref dist-stage$* -f Makefile-stage$*
+
+build.stage.%:
 	$(MAKE) -f Makefile-stage$* stage=$*
 	$(CABAL) register  --distpref dist-stage$* --inplace
 
+# XXX We ought to actually install the (stage 2) library
+install:
+	@:
+
 stage_dirs :
 	$(MKDIRHIER) stage$(stage)
 
@@ -182,10 +190,6 @@ boot :: stage_dirs
 # The 'echo' commands simply spit the values of various make variables
 # into Config.hs, whence they can be compiled and used by GHC itself
 
-boot :: $(CONFIG_HS)
-
-boot :: parser/Parser.y
-
 $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
 	@$(RM) -f $(CONFIG_HS)
 	@echo "Creating $(CONFIG_HS) ... "