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

diff --git a/compiler/Makefile b/compiler/Makefile
index 3e2ae8d..d818790 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -40,8 +40,12 @@ PRIMOP_BITS = primop-data-decl.hs-incl        \
               primop-strictness.hs-incl       \
               primop-primop-info.hs-incl
 
+boot:: boot.stage.$(stage)
+
 all:: build.stage.$(stage)
 
+doc:: doc.stage.$(stage)
+
 stage1 ::
 	$(MAKE) stage=1
 
@@ -54,12 +58,16 @@ stage3 ::
 clean distclean::
 	-$(CABAL) clean --distpref dist-stage1
 	-$(CABAL) clean --distpref dist-stage2
+	-$(CABAL) clean --distpref dist-stage3
 	$(RM) -f Makefile-stage1
 	$(RM) -f Makefile-stage2
+	$(RM) -f Makefile-stage3
 	$(RM) -f prelude/primops.txt
 	$(RM) -f $(PRIMOP_BITS)
 	$(RM) -f $(CONFIG_HS)
 	$(RM) -f parser/Parser.y
+	$(RM) -rf stage1 stage2plus
+	$(RM) -f $(STAGE3_PACKAGE_CONF)
 
 CONFIGURE_FLAGS_STAGE1 += --flags=stage1
 CONFIGURE_FLAGS_STAGE2 += --flags=-stage1
@@ -160,7 +168,8 @@ 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
+	test -e $(STAGE3_PACKAGE_CONF) || echo "[]" > $(STAGE3_PACKAGE_CONF)
 	$(CABAL) configure --distpref dist-stage$* \
 	                   $(CONFIGURE_FLAGS_STAGE$*) \
 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
@@ -168,13 +177,17 @@ 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
 
-stage_dirs :
-	$(MKDIRHIER) stage$(stage)
+doc.stage.%:
+	$(CABAL) haddock --distpref dist-stage$*
 
-boot :: stage_dirs
+# XXX We ought to actually install the (stage 2) library
+install:
+	@:
 
 # -----------------------------------------------------------------------------
 # Create compiler configuration
@@ -182,10 +195,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) ... "
@@ -290,7 +299,8 @@ endif
 
 PLATFORM_H = ghc_boot_platform.h
 
-stage1/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk
+stage1/$(PLATFORM_H) : $(FPTOOLS_TOP)/mk/config.mk
+	$(MKDIRHIER) stage1
 	@echo "Creating $@..."
 	@$(RM) $@
 	@echo "#ifndef __PLATFORM_H__"  >$@
@@ -336,7 +346,8 @@ endif
 # For stage2 and above, the BUILD platform is the HOST of stage1, and
 # the HOST platform is the TARGET of stage1.  The TARGET remains the same
 # (stage1 is the cross-compiler, not stage2).
-stage2/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk
+stage2plus/$(PLATFORM_H) : $(FPTOOLS_TOP)/mk/config.mk
+	$(MKDIRHIER) stage2plus
 	@echo "Creating $@..."
 	@$(RM) $@
 	@echo "#ifndef __PLATFORM_H__"  >$@
@@ -379,7 +390,11 @@ endif
 	@echo "#endif /* __PLATFORM_H__ */"          >> $@
 	@echo "Done."
 
-STAGE_PLATFORM_H = stage$(stage)/$(PLATFORM_H)
+ifeq "$(stage)" "1"
+STAGE_PLATFORM_H = stage1/$(PLATFORM_H)
+else
+STAGE_PLATFORM_H = stage2plus/$(PLATFORM_H)
+endif
 
 boot :: $(STAGE_PLATFORM_H)