X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=16fe934a3a95fe0904a18771c2e2cc01de1bace9;hb=027caa7f6b842751f12c1d08e90bde91a0e38a5a;hp=75106d99b5cbbfe6242cce72a9179a2bd07d9124;hpb=ef2c2b9a7eec8c683961cda967f43cb9eaf0c23a;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 75106d9..16fe934 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ else
 SUBDIRS_BUILD = includes utils driver docs compiler libraries/Cabal/doc
 endif
 
-SUBDIRS = gmp libffi includes utils driver docs rts compiler ghc libraries libraries/Cabal/doc
+SUBDIRS = gmp libffi includes utils docs rts compiler ghc driver libraries libraries/Cabal/doc
 
 check-all: check-packages
 
@@ -522,6 +522,24 @@ VERSION :
 
 dist :: VERSION
 
+# Use:
+#     $(call copy_generated_compiler_file,cmm,CmmLex,x)
+# to copy the generated file that replaces compiler/cmm/CmmLex.x
+# XXX Should this be unconditional? Do we want to support making a src dist
+# from an unbuilt tree?
+copy_generated_compiler_file = \
+  if test -f $(FPTOOLS_TOP_ABS)/compiler/dist-stage2/build/$2.hs; \
+  then \
+    $(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)
 	$(RM) $(SRC_DIST_NAME).tar.gz
@@ -531,6 +549,15 @@ dist ::
 	  && for i in $(SRC_DIST_FILES); do $(LN_S) $(FPTOOLS_TOP_ABS)/$$i .; done \
 	  && $(MAKE) distclean \
 	  && 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,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 \
 	)
@@ -564,7 +591,7 @@ hc-file-bundle :
 	     ghc-$(ProjectVersion)/libraries -follow \
 	  \( -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" \) -print > hc-files-to-go
 	for f in `$(FIND) ghc-$(ProjectVersion)/compiler ghc-$(ProjectVersion)/utils ghc-$(ProjectVersion)/libraries -name "*.hsc" -follow -print` ""; do \
-	     if test "x$$f" != "x" && test -e `echo "$$f" | sed 's/hsc$$/hs/g'`; then \
+	     if test "x$$f" != "x" && test -f `echo "$$f" | sed 's/hsc$$/hs/g'`; then \
 	        echo `echo "$$f" | sed 's/hsc$$/hs/g' ` >> hc-files-to-go ; \
 	     fi; \
 	done;