X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=6fe0fb50581a181c5cbb93740a751f0c2882a07c;hb=bc07c299081f6c8d6317339152719ce57a72a538;hp=2b1e5ab049759ee4cdc54a713b19da4f7d3960bb;hpb=57d15e1c1b85a8ec417e843827e5c8d271f7b1da;p=ghc-hetmet.git diff --git a/Makefile b/Makefile index 2b1e5ab..6fe0fb5 100644 --- a/Makefile +++ b/Makefile @@ -294,12 +294,18 @@ 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)/ghc/lib/std/PrelPrimopWrappers.hs >> hc-files-to-go + echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/*.hs-incl >> hc-files-to-go + echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/rename/ParseIface.hs >> 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 +321,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