X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=85c1bed41c16820240957dd25c77d5da7bac99ae;hb=73c2b1fb1f114982cf3ff2a02d6dc206593add75;hp=243ccf3dd91136e7848e9121990237ae62b36607;hpb=53ededd082a1efa78d54aaa855d7e7e76a8c7366;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 243ccf3..85c1bed 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,6 @@ BIN_DIST_TOP= distrib/Makefile-bin.in \
 	      distrib/INSTALL \
 	      $(BIN_DIST_MAIN_DIR)/ANNOUNCE \
 	      $(BIN_DIST_MAIN_DIR)/VERSION \
-	      $(BIN_DIST_MAIN_DIR)/RELEASE \
 	      $(BIN_DIST_MAIN_DIR)/LICENSE \
 	      $(BIN_DIST_MAIN_DIR)/README \
 	      glafp-utils/mkdirhier/mkdirhier \
@@ -98,6 +97,9 @@ BIN_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
 BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
 
 binary-dist-pre::
+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
 	@for i in $(BIN_DIST_DIRS); do 		 	 \
@@ -161,7 +163,6 @@ binary-dist::
 BINDIST_DOCS = $($(Project)BinDistDocs)
 BINDIST_DOCS_WAYS = html ps
 
-ifeq "$(HOSTPLATFORM)" "i386-unknown-linux"
 binary-dist ::
 	@for way in $(BINDIST_DOCS_WAYS); do \
 	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way; \
@@ -180,7 +181,6 @@ binary-dist ::
 	   done; \
 	done
 	@rm -f .doclog
-endif
 
 # Rename scripts to $i.prl and $i.sh where necessary.
 # ToDo: do this in a cleaner way...
@@ -256,7 +256,7 @@ SRC_DIST_FILES += \
 	aclocal.m4 acconfig.h README Makefile Makefile.config install-sh \
 	mk/bootstrap.mk \
 	mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \
-	mk/paths.mk mk/suffix.mk mk/target.mk
+	mk/paths.mk mk/package.mk mk/suffix.mk mk/target.mk
 
 dist dist-manifest dist-package :: project-check
 
@@ -297,12 +297,17 @@ hc-file-bundle : project-check
 	     $(ProjectNameShort)-$(ProjectVersion)/ghc/driver \
 	     $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
 	     $(ProjectNameShort)-$(ProjectVersion)/hslibs \
-	  -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" > hc-files-to-go
+	  \( -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" | sed 's/hsc$$/hs/g' >> hc-files-to-go
+	  -name "*.hsc" -print | sed 's/hsc$$/hs/g' >> hc-files-to-go
+	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/main/ParsePkgConf.hs >> hc-files-to-go
+	echo $(ProjectNameShort)-$(ProjectVersion)/hslibs/hssource/HsParser.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
@@ -311,11 +316,24 @@ CLEAN_FILES += hc-files-to-go *-hc.tar.gz
 
 DIST_CLEAN_FILES += config.cache config.status
 
+#
+# If you've ended up using an in-place version of Happy,
+# make sure it gets built early on.
+#
+ifeq "$(HAPPY)" "$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace"
+all :: $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace
+
+$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace : glafp-utils
+	$(MAKE) -C happy boot all
+endif
+
 all ::
 	@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 \
-	      $(MAKE) -C $$i boot all; \
+	      $(MAKE) -C $$i boot; \
+	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
+	      $(MAKE) -C $$i all; \
 	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
 	      fi; \
 	done
@@ -333,6 +351,15 @@ install ::
 	      fi; \
 	done
 
+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; \
+	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
+	      fi; \
+	done
+
 # Turn off target.mk's rules for 'all', 'boot' and 'install'.
 NO_BOOT_TARGET=YES
 NO_ALL_TARGET=YES