X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=96d0996165d160e3e9179153e47adc2a186aa501;hb=9b20d38e5ab6b48e5dba7584296dd5dd4801549d;hp=bbaceb9c52718b57bc4cc06364e12a7adde04ecd;hpb=ea50f411373d21941bd387bb821bb8671266f178;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index bbaceb9..96d0996 100644
--- a/Makefile
+++ b/Makefile
@@ -336,6 +336,7 @@ binary-dist::
 	$(MAKE) -C driver              binary-dist WHERE_AM_I=$(WHERE_AM_I)/driver
 	$(MAKE) -C utils               binary-dist WHERE_AM_I=$(WHERE_AM_I)/utils
 	$(MAKE) -C docs                binary-dist WHERE_AM_I=$(WHERE_AM_I)/docs
+	$(MAKE) -C libffi              binary-dist WHERE_AM_I=$(WHERE_AM_I)/libffi
 	$(MAKE) -C libraries           binary-dist WHERE_AM_I=$(WHERE_AM_I)/libraries
 	$(MAKE) -C libraries/Cabal/doc binary-dist WHERE_AM_I=$(WHERE_AM_I)/libraries/Cabal/doc
 # Now thinks get messier. Some files we need to move around, rename or
@@ -533,6 +534,12 @@ copy_generated_compiler_file = \
     $(CP) $(FPTOOLS_TOP_ABS)/compiler/dist-stage2/build/$2.hs compiler/$1/ ; \
     mv compiler/$1/$2.$3 compiler/$1/$2.$3.source ; \
   fi
+copy_generated_util_file = \
+  if test -f $(FPTOOLS_TOP_ABS)/utils/$1/dist-install/build/$1/$1-tmp/$2.hs; \
+  then \
+    $(CP) $(FPTOOLS_TOP_ABS)/utils/$1/dist-install/build/$1/$1-tmp/$2.hs utils/$1/ ; \
+    mv utils/$1/$2.$3 utils/$1/$2.$3.source ; \
+  fi
 
 dist ::
 	$(RM) -rf $(SRC_DIST_DIR)
@@ -545,12 +552,13 @@ dist ::
 	  && if test -f $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs; then $(CP) $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs libraries/haskell-src/Language/Haskell/ ; mv libraries/haskell-src/Language/Haskell/Parser.ly libraries/haskell-src/Language/Haskell/Parser.ly.source ; fi \
 	  && $(call copy_generated_compiler_file,cmm,CmmLex,x) \
 	  && $(call copy_generated_compiler_file,cmm,CmmParse,y) \
+	  && $(call copy_generated_compiler_file,main,ParsePkgConf,y) \
 	  && $(call copy_generated_compiler_file,parser,HaddockLex,x) \
 	  && $(call copy_generated_compiler_file,parser,HaddockParse,y) \
 	  && $(call copy_generated_compiler_file,parser,Lexer,x) \
-	  && $(call copy_generated_compiler_file,parser,ParsePkgCore,y) \
 	  && $(call copy_generated_compiler_file,parser,Parser,y.pp) \
 	  && $(call copy_generated_compiler_file,parser,ParserCore,y) \
+	  && $(call copy_generated_util_file,hpc,HpcParser,y) \
 	  && $(RM) -rf compiler/stage[123] mk/build.mk \
 	  && $(FIND) $(SRC_DIST_DIRS) \( -name _darcs -o -name SRC -o -name "autom4te*" -o -name "*~" -o -name ".cvsignore" -o -name "\#*" -o -name ".\#*" -o -name "log" -o -name "*-SAVE" -o -name "*.orig" -o -name "*.rej" \) -print | xargs $(RM) -rf \
 	)