From: Ian Lynagh Date: Fri, 18 Jul 2008 19:34:54 +0000 (+0000) Subject: More dependency wibbling X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=a9afdc24b1b2bbe63d71e8e2890770edfa8a6a8d More dependency wibbling --- diff --git a/compiler/Makefile b/compiler/Makefile index 371ebb4..00ae2c2 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -40,10 +40,6 @@ PRIMOP_BITS = primop-data-decl.hs-incl \ primop-strictness.hs-incl \ primop-primop-info.hs-incl -boot :: $(CONFIG_HS) - -boot :: parser/Parser.y - boot:: boot.stage.$(stage) all:: build.stage.$(stage) @@ -166,7 +162,7 @@ CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS) CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS) CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS) -boot.stage.%: +boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) parser/Parser.y $(CABAL) configure --distpref dist-stage$* \ $(CONFIGURE_FLAGS_STAGE$*) \ $(INSTALL_DIRS_CONFIGURE_FLAGS) \ @@ -175,7 +171,7 @@ boot.stage.%: $(RM) -f Makefile-stage$* $(CABAL) makefile --distpref dist-stage$* -f Makefile-stage$* -build.stage.%: $(PRIMOP_BITS) +build.stage.%: $(MAKE) -f Makefile-stage$* stage=$* $(CABAL) register --distpref dist-stage$* --inplace