X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=76ba2f9bede1eec52062773e4ca9bec366e856d8;hb=16d34c16e19ad0cd5e9b5f0ca8004689c277d52d;hp=376351619646da6cdf955160d927cc67236f80b9;hpb=474955abf3fe4d26171b3ba5ecdbc1784c80cf3a;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 3763516..76ba2f9 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,16 @@ SUBDIRS = $(filter $(ProjectsToBuild), $(ProjectsThatExist))
 endif
 
 ifneq "$(Project)" ""
-   include $(shell echo $(Project) | tr A-Z a-z)/mk/config.mk
+   ifeq "$(Project)" "GreenCard"
+       ProjectDirectory=green-card
+   else
+	ifeq "$(Project)" "HaskellDirect"
+		ProjectDirectory=hdirect
+	else
+		ProjectDirectory=$(Project)
+	endif
+   endif
+   include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/config.mk
 endif
 
 # -----------------------------------------------------------------------------
@@ -102,6 +111,7 @@ ifeq "$(BIN_DIST)" ""
 endif
 	-rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)
 	-$(RM) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz
+	-echo "BIN_DIST_DIRS = $(BIN_DIST_DIRS)"
 	@for i in $(BIN_DIST_DIRS); do 		 	 \
 	  if test -d "$$i"; then 			 \
 	   echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM); \
@@ -161,19 +171,20 @@ binary-dist::
 #
 
 BINDIST_DOC_WAYS = html ps
+# BINDIST_DOC_WAYS =
 
 binary-dist ::
 	@for i in $(BIN_DIST_DIRS); do 		 	 	\
 	  if test -d "$$i"; then 			 	\
 	    $(MAKE) -C $$i $(MFLAGS) $(BINDIST_DOC_WAYS); 	\
-	    echo $(MAKE) -C $$i $(MFLAGS) install-docs SGMLDocWays="html ps" \
+	    echo $(MAKE) -C $$i $(MFLAGS) install-docs SGMLDocWays="$(BINDIST_DOC_WAYS)" \
 		prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) 	\
 		exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
 		bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
 		libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
 		libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
 		datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
-	    $(MAKE) -C $$i $(MFLAGS) install-docs SGMLDocWays="html ps" \
+	    $(MAKE) -C $$i $(MFLAGS) install-docs SGMLDocWays="$(BINDIST_DOC_WAYS)" \
 		prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) 	\
 		exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
 		bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
@@ -324,13 +335,14 @@ DIST_CLEAN_FILES += config.cache config.status
 # make sure it gets built early on.
 #
 ifeq "$(HAPPY)" "$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace"
-all :: $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace
+build : $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace
 
 $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace : glafp-utils
 	$(MAKE) -C happy boot all
 endif
 
-all ::
+# Build all projects that we know about
+build :
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
 	for i in $(SUBDIRS); do \
 	   if [ -d $$i ]; then \
@@ -341,6 +353,38 @@ all ::
 	      fi; \
 	done
 
+ifeq "$(findstring ghc, $(SUBDIRS))" "ghc"
+
+stage1 : build
+
+stage2 :
+	$(MAKE) -C ghc/compiler boot stage=2
+	$(MAKE) -C ghc/compiler stage=2
+
+stage3 :
+	$(MAKE) -C ghc/compiler boot stage=3
+	$(MAKE) -C ghc/compiler stage=3
+
+bootstrap  : bootstrap2
+bootstrap2 : stage1 stage2
+bootstrap3 : stage1 stage2 stage3
+
+all :: bootstrap
+
+# We want to install the stage 2 bootstrapped compiler by default, but we let
+# the user override this by saying 'make install stage=1', for example.
+ifeq "$(stage)" ""
+INSTALL_STAGE = stage=2
+endif
+
+else # Not building GHC
+
+all :: build
+
+INSTALL_STAGE =
+
+endif
+
 boot ::
 	@echo "Please use \`make all' only from the top-level, or \`make boot' followed"
 	@echo "by \`make all' in an individual project subdirectory (ghc, hslibs etc.)."
@@ -349,7 +393,7 @@ install ::
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
 	for i in $(filter-out $(ProjectsDontInstall), $(SUBDIRS)); do \
 	   if [ -d $$i ]; then \
-	      $(MAKE) -C $$i install; \
+	      $(MAKE) -C $$i $(INSTALL_STAGE) install; \
 	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
 	      fi; \
 	done
@@ -358,7 +402,7 @@ install-docs ::
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
 	for i in $(filter-out $(ProjectsDontInstall), $(SUBDIRS)); do \
 	   if [ -d $$i ]; then \
-	      $(MAKE) -C $$i install-docs; \
+	      $(MAKE) -C $$i $(INSTALL_STAGE) install-docs; \
 	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
 	      fi; \
 	done