[commit: ghc] master: Be more aggressive in `make clean` (0a0115f)

git at git.haskell.org git at git.haskell.org
Tue Apr 22 21:00:08 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0a0115fe17b22d1252220fe1ed0ba1dcc2839546/ghc

>---------------------------------------------------------------

commit 0a0115fe17b22d1252220fe1ed0ba1dcc2839546
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Apr 22 22:23:56 2014 +0200

    Be more aggressive in `make clean`
    
    This quiets down the utils/testremove/checkremove step
    
    Basically the idea is to have 'make clean' remove everything that was
    generated by `make`, while `make distclean` ought to remove everything
    created by `./configure`.
    
    Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>


>---------------------------------------------------------------

0a0115fe17b22d1252220fe1ed0ba1dcc2839546
 ghc.mk |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ghc.mk b/ghc.mk
index dab9050..666d0a9 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1202,6 +1202,11 @@ sdist_%:
 
 CLEAN_FILES += libraries/bootstrapping.conf
 CLEAN_FILES += libraries/integer-gmp/cbits/GmpDerivedConstants.h
+CLEAN_FILES += libraries/integer-gmp/include/HsIntegerGmp.h
+CLEAN_FILES += libraries/base/include/EventConfig.h
+CLEAN_FILES += mk/config.mk.old
+CLEAN_FILES += mk/project.mk.old
+CLEAN_FILES += compiler/ghc.cabal.old
 
 # These are no longer generated, but we still clean them for a while
 # as they may still be in old GHC trees:
@@ -1219,6 +1224,9 @@ clean : clean_files clean_libraries
 .PHONY: clean_files
 clean_files :
 	$(call removeFiles,$(CLEAN_FILES))
+# this is here since CLEAN_FILES can't handle folders
+	$(call removeTrees,includes/dist-derivedconstants)
+	$(call removeTrees,inplace)
 
 .PHONY: clean_libraries
 clean_libraries: $(patsubst %,clean_libraries/%_dist-install,$(PACKAGES_STAGE1) $(PACKAGES_STAGE2))



More information about the ghc-commits mailing list