X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FMakefile;h=f099ab718b9d26492dd73acf7532c64833d4a0a4;hp=7618f680a1f6d53f4cd49232d0aac35608d5f514;hb=927df6486bc0dcb598b82702ca40c8fad0d9b25f;hpb=f684f630a90eea64a13542c3bb0a1ab54a5067b7

diff --git a/compiler/Makefile b/compiler/Makefile
index 7618f68..f099ab7 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -10,28 +10,15 @@
 #
 # -----------------------------------------------------------------------------
 
-dir = compiler
-TOP = ..
-SPEC_TARGETS = 1 2 3
-include $(TOP)/mk/sub-makefile.mk
-
-.PHONY: 1 2 3
+# If the user says 'make' or 'make stage=2' here, we behave as if they were
+# in the ghc directory instead, so that the executable GHC gets built.
+.PHONY: default_to_ghc all_ghc
+default_to_ghc : all_ghc
 
-1:
-	+$(TOPMAKE) stage=1 all_ghc_stage1 compiler_stage1_NO_BUILD_DEPS=YES OMIT_PHASE_1=YES OMIT_PHASE_2=YES OMIT_PHASE_3=YES
+dir = compiler
 
-2:
-	+$(TOPMAKE) stage=2 all_ghc_stage2 compiler_stage2_NO_BUILD_DEPS=YES OMIT_PHASE_1=YES OMIT_PHASE_2=YES OMIT_PHASE_3=YES
+include ../mk/compiler-ghc.mk
 
-3:
-	+$(TOPMAKE) stage=3 all_ghc_stage3 compiler_stage3_NO_BUILD_DEPS=YES OMIT_PHASE_1=YES OMIT_PHASE_2=YES OMIT_PHASE_3=YES
+all_ghc :
+	+$(TOPMAKE) all_ghc $(EXTRA_MAKE_OPTS)
 
-.PHONY: extra-help
-help : extra-help
-extra-help :
-	@echo "  make 1"
-	@echo "  make 2"
-	@echo "  make 3"
-	@echo
-	@echo "     Build the stage 1, 2 or 3 GHC respectively, omitting dependencies"
-	@echo "     and initial phases for speed."