X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=61b139f1403ab04db2345b4e1a72ddd398b869f7;hb=7654ff058ca281756dd98ee976685a9261df63f0;hp=3de5928df546c7eac8154fab806a8aa8b5e9c843;hpb=ec9fbf1789426a35e59b531b4a6805028eee4ee2;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 3de5928..61b139f 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
@@ -512,7 +513,7 @@ SRC_DIST_FILES += \
 #   - remove a bunch of other files that we know shouldn't be in the dist
 #   - tar up first the extralibs package, then the main source package
 
-EXTRA_LIBS=$(patsubst %, $(SRC_DIST_NAME)/libraries/%, $(shell cat libraries/extra-packages))
+EXTRA_LIBS=$(patsubst %, $(SRC_DIST_NAME)/%, $(shell grep -E "extralibs|dph" packages | grep -v "^\#" | sed "s/ .*//"))
 
 SRC_DIST_TARBALL = ghc-$(ProjectVersion)-src.tar.bz2
 SRC_DIST_EXTRALIBS_TARBALL = ghc-$(ProjectVersion)-src-extralibs.tar.bz2
@@ -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)
@@ -551,6 +558,7 @@ dist ::
 	  && $(call copy_generated_compiler_file,parser,Lexer,x) \
 	  && $(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 \
 	)