X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=4be31281f38aea27369e595c44f9c12263f5aec4;hb=c8d104addebe339b69b14844a41e8b7e3371f43f;hp=c338a80275b5d11fa192451bd8988215ae6645cc;hpb=9c02be64bb791a49d20a113259cba6a9b71a82d8;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index c338a80..4be3128 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
 
 # -----------------------------------------------------------------------------
@@ -101,7 +110,8 @@ ifeq "$(BIN_DIST)" ""
 	echo "WARNING: To run the binary-dist target, you need to set BIN_DIST=1 in your build.mk" && exit 1
 endif
 	-rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)
-	-rm -f $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz
+	-$(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) \
@@ -217,6 +228,7 @@ binary-pack::
 	( cd $(BIN_DIST_TMPDIR); $(TAR) chzf $(BIN_DIST_NAME).tar.gz $(BIN_DIST_NAME) )
 
 ifneq "$(way)" ""
+.PHONY: package-way-dist
 package-way-dist::
 	( cd $(BIN_DIST_TMPDIR); $(FIND) $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print | xargs tar cvf $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar )
 	gzip $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar
@@ -224,7 +236,7 @@ endif
 
 ifneq "$(way)" ""
 remove-way-dist::
-	( cd $(BIN_DIST_TMPDIR); $(FIND) $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print -exec rm -f {} \; )
+	( cd $(BIN_DIST_TMPDIR); $(FIND) $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print -exec $(RM) {} \; )
 endif
 
 binary-dist::
@@ -266,16 +278,16 @@ dist :: distclean
 
 dist ::
 	-rm -rf $(SRC_DIST_DIR)
-	-rm -f $(SRC_DIST_NAME).tar.gz
+	-$(RM) $(SRC_DIST_NAME).tar.gz
 	mkdir $(SRC_DIST_DIR)
 	mkdir $(SRC_DIST_DIR)/mk
-	( cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) -type d \( -name CVS -prune -o -name SRC -prune -o -print \) | sed -e 's!.*!mkdir "$(SRC_DIST_DIR)/&"!' | sh )
-	( cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) $(SRC_DIST_FILES) -name CVS -prune -o -name SRC -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -name "\#*" -prune -o -name ".\#*" -prune -o -name "log" -prune -o -name "*-SAVE" -prune -o -name "*.orig" -prune -o -name "*.rej" -prune -o ! -type d -print | sed -e 's!.*!$(LN_S) "$(FPTOOLS_TOP_ABS)/&" "$(SRC_DIST_DIR)/&"!' | sh )
+	$(FIND) $(SRC_DIST_DIRS) -type d \( -name CVS -prune -o -name SRC -prune -o -print \) | sed -e 's!.*!mkdir "$(SRC_DIST_DIR)/&"!' | sh
+	$(FIND) $(SRC_DIST_DIRS) $(SRC_DIST_FILES) -name CVS -prune -o -name SRC -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -name "\#*" -prune -o -name ".\#*" -prune -o -name "log" -prune -o -name "*-SAVE" -prune -o -name "*.orig" -prune -o -name "*.rej" -prune -o ! -type d -print | sed -e 's!.*!$(LN_S) "$(FPTOOLS_TOP_ABS)/&" "$(SRC_DIST_DIR)/&"!' | sh
 
 # Automatic generation of a MANIFEST file for a source distribution
 # tree that is ready to go.
 dist-manifest ::
-	cd $(SRC_DIST_DIR); $(FIND) . \( -type l -o -type f \) -exec ls -lLG {} \; | sed -e 's/\.\///' > MANIFEST.tmp ; mv MANIFEST.tmp MANIFEST
+	cd $(SRC_DIST_DIR); $(FIND) . \( -type l -o -type f \) -exec ls -lLG {} \; | sed -e 's/\.\///' > MANIFEST
 
 dist-package :: dist-package-tar-gz
 
@@ -295,20 +307,21 @@ hc-file-bundle : project-check
 	$(RM) -r $(ProjectNameShort)-$(ProjectVersion)
 	$(LN_S) . $(ProjectNameShort)-$(ProjectVersion)
 	$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
-	     $(ProjectNameShort)-$(ProjectVersion)/ghc/driver \
-	     $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
+	     $(ProjectNameShort)-$(ProjectVersion)/ghc/utils \
+	     $(ProjectNameShort)-$(ProjectVersion)/libraries \
 	     $(ProjectNameShort)-$(ProjectVersion)/hslibs \
 	  \( -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" \) -print > hc-files-to-go
-	$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
-	     $(ProjectNameShort)-$(ProjectVersion)/ghc/driver \
-	     $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
-	     $(ProjectNameShort)-$(ProjectVersion)/hslibs \
-	  -name "*.hsc" -print | sed 's/hsc$$/hs/g' >> hc-files-to-go
+	for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler $(ProjectNameShort)-$(ProjectVersion)/ghc/utils $(ProjectNameShort)-$(ProjectVersion)/libraries $(ProjectNameShort)-$(ProjectVersion)/hslibs -name "*.hsc" -print` ""; do \
+	     if test "x$$f" != "x" && test -e `echo "$$f" | sed 's/hsc$$/hs/g'`; then \
+	        echo `echo "$$f" | sed 's/hsc$$/hs/g' ` >> hc-files-to-go ; \
+	     fi; \
+	done;
 	echo $(ProjectNameShort)-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> hc-files-to-go
 	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/*.hs-incl >> hc-files-to-go
 	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/Parser.hs >> hc-files-to-go
+	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/ParserCore.hs >> hc-files-to-go
 	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/main/ParsePkgConf.hs >> hc-files-to-go
-	echo $(ProjectNameShort)-$(ProjectVersion)/hslibs/hssource/HsParser.hs >> hc-files-to-go
+	echo $(ProjectNameShort)-$(ProjectVersion)/libraries/haskell-src/Language/Haskell/Parser.hs >> hc-files-to-go
 	tar czf $(ProjectNameShort)-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go`
 
 CLEAN_FILES += hc-files-to-go *-hc.tar.gz
@@ -322,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 \
@@ -339,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.)."
@@ -347,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
@@ -356,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