diff options
author | Ian Lynagh <igloo@earth.li> | 2012-01-11 15:54:30 +0000 |
---|---|---|
committer | Ian Lynagh <igloo@earth.li> | 2012-01-11 15:54:30 +0000 |
commit | a83b02adcadef83ccc9ea66b1d9fc20bcd035214 (patch) | |
tree | c8d9551025679dfbc137df9ca00fec97ed66b9fc /ghc.mk | |
parent | ce545f0dca832d0df12e8601c1288c849a7194f5 (diff) | |
download | haskell-a83b02adcadef83ccc9ea66b1d9fc20bcd035214.tar.gz |
Clean more files in "make clean"
The libraries get configured during "make", so plain old "make clean"
should clean up the configure droppings.
Also fixed another wildcard/patsubst problem.
Diffstat (limited to 'ghc.mk')
-rw-r--r-- | ghc.mk | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1152,6 +1152,9 @@ clean_libraries: $(patsubst %,clean_libraries/%_dist-boot,$(PACKAGES_STAGE0)) clean_libraries: $(call removeTrees,$(patsubst %, libraries/%/dist, $(PACKAGES_STAGE1) $(PACKAGES_STAGE2))) $(call removeFiles,$(wildcard $(patsubst %, libraries/%/*.buildinfo, $(PACKAGES_STAGE1) $(PACKAGES_STAGE2)))) + $(call removeFiles,$(patsubst %, libraries/%/config.log, $(PACKAGES_STAGE1) $(PACKAGES_STAGE2))) + $(call removeFiles,$(patsubst %, libraries/%/config.status, $(PACKAGES_STAGE1) $(PACKAGES_STAGE2))) + $(call removeFiles,$(wildcard $(patsubst %, libraries/%/include/Hs*Config.h, $(PACKAGES_STAGE1) $(PACKAGES_STAGE2)))) # We have to define a clean target for each library manually, because the # libraries/*/ghc.mk files are not included when we're cleaning. @@ -1186,10 +1189,6 @@ distclean : clean $(call removeFiles,libraries/old-time/include/HsTimeConfig.h) $(call removeTrees,utils/ghc-pwd/dist) $(call removeTrees,inplace) - - $(call removeFiles,$(patsubst %, libraries/%/config.log, $(PACKAGES_STAGE1) $(PACKAGES_STAGE2))) - $(call removeFiles,$(patsubst %, libraries/%/config.status, $(PACKAGES_STAGE1) $(PACKAGES_STAGE2))) - $(call removeFiles,$(patsubst %, $(wildcard,libraries/%/include/Hs*Config.h), $(PACKAGES_STAGE1) $(PACKAGES_STAGE2))) $(call removeTrees,$(patsubst %, libraries/%/autom4te.cache, $(PACKAGES_STAGE1) $(PACKAGES_STAGE2))) maintainer-clean : distclean |