X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=14347ed407b932a6502ffa00de026c2d1ac1c3a2;hb=79c92c8b26680cee193752867250e39fb61a026c;hp=6ea209be949b7e61dc4ddf6941d62e3047ebed99;hpb=9c325bab1e7ed7d305a79ef9e366b6ac87b8b1b6;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 6ea209b..14347ed 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -56,7 +56,7 @@ stage3 ::
 	$(MAKE) stage=3
 
 ifeq "$(CLEAN_ALL_STAGES)" "YES"
-clean distclean::
+clean distclean maintainer-clean::
 	$(RM) -f prelude/primops.txt
 	$(RM) -f $(PRIMOP_BITS)
 	$(RM) -f $(CONFIG_HS)
@@ -66,14 +66,23 @@ clean distclean::
 endif
 
 ifeq "$(CLEAN_ALL_STAGES)" "YES"
-clean distclean:: clean.stage.1 clean.stage.2 clean.stage.3
+clean distclean maintainer-clean:: clean.stage.1 clean.stage.2 clean.stage.3
 else
-clean distclean:: clean.stage.$(stage)
+clean distclean maintainer-clean:: clean.stage.$(stage)
+endif
+
+ifeq "$(CLEAN_ALL_STAGES)" "YES"
+distclean maintainer-clean::
+	$(RM) -f ghc.cabal
 endif
 
 clean.stage.%:
-	-$(CABAL) clean --distpref dist-stage$*
 	$(RM) -f Makefile-stage$*
+# This is a bit naughty. We ought to use:
+#	-$(CABAL) clean --distpref dist-stage$*
+# but that won't work if the Cabal file (a generated file) doesn't
+# exist. So we do this instead:
+	$(RM) -rf dist-stage$*
 
 CONFIGURE_FLAGS_STAGE1 += --flags=stage1
 CONFIGURE_FLAGS_STAGE2 += --flags=-stage1
@@ -144,9 +153,16 @@ endif
 # profiling enabled (GhcProfiled = YES).
 ifneq "$(GhcLibProfiled) $(GhcProfiled)" "NO NO"
 CONFIGURE_FLAGS_STAGE2 += --enable-library-profiling
-# And if we're profiling GHC then we want lots of SCCs
+# And if we're profiling GHC then we want lots of SCCs.
+# We also don't want to waste time building the non-profiling library,
+# either normally or for ghci. Unfortunately this means that we have to
+# tell ghc-pkg --force as it gets upset when libHSghc-6.9.a doesn't
+# exist.
 ifeq "$(GhcProfiled)" "YES"
 CONFIGURE_FLAGS_STAGE2 += --ghc-option=-auto-all
+CONFIGURE_FLAGS_STAGE2 += --disable-library-vanilla
+CONFIGURE_FLAGS_STAGE2 += --disable-library-for-ghci
+CONFIGURE_FLAGS_STAGE2 += --ghc-pkg-option=--force
 endif
 endif
 
@@ -173,7 +189,13 @@ CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS)
 CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
 
-boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) parser/Parser.y
+# In a source dist we don't need to worry about Parser.y(.pp) as we have
+# the .hs file pre-generated
+ifneq "$(wildcard parser/Parser.y.pp)" ""
+PARSER_Y = parser/Parser.y
+endif
+
+boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) $(PARSER_Y)
 	test -f $(STAGE3_PACKAGE_CONF) || echo "[]" > $(STAGE3_PACKAGE_CONF)
 	$(CABAL) configure --distpref dist-stage$* \
 	                   $(CONFIGURE_FLAGS_STAGE$*) \
@@ -191,6 +213,7 @@ build.stage.%:
 doc.stage.%:
 	$(CABAL) haddock --distpref dist-stage$* \
 	                 --haddock-option=--optghc=-DSTAGE=$* \
+	                 --haddock-option=+RTS --haddock-option=-s --haddock-option=-c --haddock-option=-RTS \
 	                 --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock
 
 install:
@@ -460,5 +483,19 @@ BINDIST_EXTRAS += stage2plus/ghc_boot_platform.h
 endif
 
 include $(TOP)/mk/bindist.mk
-LIB_DIST_DIR = dist-stage$(stage)
+LIB_DIST_DIR = dist-stage2
+
+#-----------------------------------------------------------------------------
+# etags generation
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+GHCTAGS = $(TOP)/utils/ghctags/ghctags.exe
+else
+GHCTAGS = $(TOP)/utils/ghctags/ghctags-inplace
+endif
+GHCTAGS_ROOT = main/GHC.hs ghci/InteractiveUI.hs
 
+# etags for stage2 is actually broken since it requires building
+# ghctags against an older ghc api
+etags: etags.stage.2
+etags.stage.%:
+	$(GHCTAGS) --topdir $(FPTOOLS_TOP_ABS) --etags --use-cabal-config=./dist-stage$* -- -DSTAGE=$* -- $(GHCTAGS_ROOT)