[project @ 2002-04-05 15:18:25 by sof]

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 2b1e5ab..7b7f50e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -97,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                   \
@@ -294,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
@@ -315,8 +323,7 @@ DIST_CLEAN_FILES += config.cache config.status
 ifeq "$(HAPPY)" "$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace"
 all :: $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace
 
-$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace :
-       cd ghc/includes && make boot
+$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace : glafp-utils
        cd happy && make boot all
 endif