X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=a00fa07f6c66afaea451546f8064f64130931a06;hb=9ced2b5962e84d84694cde112e1befe52f970d7b;hp=317d9827a96a294654f81e6e6f09f5f3d98b42ff;hpb=b3be1a29ab3390cbcf07ca39ab8ab37b1301d0d9;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 317d982..a00fa07 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,8 @@ ifneq "$(Project)" ""
 		ProjectDirectory=$(Project)
 	endif
    endif
-   include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/config.mk
+   -include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/config.mk
+   -include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/version.mk
 endif
 
 # -----------------------------------------------------------------------------
@@ -76,6 +77,8 @@ build ::
 
 ifeq "$(findstring ghc, $(SUBDIRS))" "ghc"
 
+.PHONY: stage1 stage2 stage3 bootstrap bootstrap2 bootstrap3
+
 stage1 : build
 
 stage2 :
@@ -87,8 +90,12 @@ stage3 :
 	$(MAKE) -C ghc/compiler stage=3
 
 bootstrap  : bootstrap2
-bootstrap2 : stage1 stage2
-bootstrap3 : stage1 stage2 stage3
+
+bootstrap2 : stage1
+	$(MAKE) stage2
+
+bootstrap3 : bootstrap2
+	$(MAKE) stage3
 
 all :: bootstrap
 
@@ -260,6 +267,7 @@ binary-dist::
 	echo "PACKAGE_SH_SCRIPTS = $($(Project)BinDistShScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	echo "PACKAGE_PRL_SCRIPTS = $($(Project)BinDistPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	echo "PACKAGE_LIB_PRL_SCRIPTS = $($(Project)BinDistLibPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+	echo "PACKAGE_LIB_SPLICED_FILES = $($(Project)BinDistLibSplicedFiles)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	echo "PACKAGE_BINS = $($(Project)BinDistBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	echo "PACKAGE_LINKS = $($(Project)BinDistLinks)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	cat $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
@@ -283,7 +291,7 @@ BINDIST_DOC_WAYS = html ps
 # BINDIST_DOC_WAYS =
 
 binary-dist ::
-ifneq "$(DOCBOOK_CATALOG)" ""
+ifneq "$(DIR_DOCBOOK_XSL)" ""
 	@for i in $(BIN_DIST_DIRS); do 		 	 	\
 	  if test -d "$$i"; then 			 	\
 	    $(MAKE) -C $$i $(MFLAGS) $(BINDIST_DOC_WAYS); 	\
@@ -327,8 +335,10 @@ endif
 ifneq "$($(Project)BinDistShScripts)" ""
 binary-dist::
 	@for i in $($(Project)BinDistShScripts); do \
-	     echo "Renaming $$i to $$i.sh"; \
-	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.sh; \
+	    if test -x $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i ; then \
+	    	echo "Renaming $$i to $$i.sh"; \
+	    	$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.sh; \
+	    fi \
 	done
 endif
 
@@ -377,10 +387,11 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 SRC_DIST_DIRS += docs distrib $(filter-out docs distrib,$(SUBDIRS))
 SRC_DIST_FILES += \
 	configure.ac config.guess config.sub configure \
-	aclocal.m4 README Makefile Makefile.config install-sh \
+	aclocal.m4 README Makefile install-sh \
 	mk/bootstrap.mk \
 	mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \
-	mk/paths.mk mk/package.mk mk/suffix.mk mk/target.mk
+	mk/paths.mk mk/package.mk mk/suffix.mk mk/target.mk \
+	mk/fptools.css mk/fix_install_names.sh
 
 dist dist-manifest dist-package :: project-check
 
@@ -404,8 +415,11 @@ dist-package :: dist-package-tar-gz
 
 SRC_DIST_PATHS = $(patsubst %, $(SRC_DIST_NAME)/%, $(SRC_DIST_FILES) $(SRC_DIST_DIRS))
 
+dist-package-tar-bz2 ::
+	BZIP2=-9 $(TAR) chjf $(SRC_DIST_NAME)-src.tar.bz2 $(SRC_DIST_NAME) || $(RM) $(SRC_DIST_NAME)-src.tar.bz2
+
 dist-package-tar-gz ::
-	$(TAR) chzf $(SRC_DIST_NAME)-src.tar.gz $(SRC_DIST_NAME)
+	$(TAR) chzf $(SRC_DIST_NAME)-src.tar.gz $(SRC_DIST_NAME) || $(RM) $(SRC_DIST_NAME)-src.tar.gz
 
 dist-package-zip ::
 	cd ..; $(LN_S) $(FPTOOLS_TOP_ABS) $(SRC_DIST_NAME) && \
@@ -419,6 +433,7 @@ hc-file-bundle : project-check
 	$(LN_S) . $(ProjectNameShort)-$(ProjectVersion)
 	$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
 	     $(ProjectNameShort)-$(ProjectVersion)/ghc/utils \
+	     $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
 	     $(ProjectNameShort)-$(ProjectVersion)/libraries -follow \
 	  \( -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" \) -print > hc-files-to-go
 	for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler $(ProjectNameShort)-$(ProjectVersion)/ghc/utils $(ProjectNameShort)-$(ProjectVersion)/libraries -name "*.hsc" -follow -print` ""; do \
@@ -426,7 +441,11 @@ hc-file-bundle : project-check
 	        echo `echo "$$f" | sed 's/hsc$$/hs/g' ` >> hc-files-to-go ; \
 	     fi; \
 	done;
-	echo $(ProjectNameShort)-$(ProjectVersion)/ghc/rts/AutoApply.hc >> hc-files-to-go
+	for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler $(ProjectNameShort)-$(ProjectVersion)/ghc/rts -name "*.cmm" -follow -print` ""; do \
+	     if test "x$$f" != "x"; then \
+	        echo `echo "$$f" | sed 's/cmm$$/hc/g' ` >> hc-files-to-go ; \
+	     fi; \
+	done;
 	echo $(ProjectNameShort)-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> 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