From ff30c8f61ed7318563a4f9185815e80cf35e363d Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Mon, 17 Jan 2011 12:11:55 +0000 Subject: [PATCH] Tidy up gmp cleaning --- ghc.mk | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/ghc.mk b/ghc.mk index d1565e9..5040ff5 100644 --- a/ghc.mk +++ b/ghc.mk @@ -567,6 +567,8 @@ endif ifeq "$(INTEGER_LIBRARY)" "integer-gmp" BUILD_DIRS += libraries/integer-gmp/gmp +else ifneq "$(findstring clean,$(MAKECMDGOALS))" "" +BUILD_DIRS += libraries/integer-gmp/gmp endif BUILD_DIRS += \ @@ -1187,17 +1189,6 @@ clean : clean_files clean_libraries clean_files : "$(RM)" $(RM_OPTS) $(CLEAN_FILES) -ifneq "$(NO_CLEAN_GMP)" "YES" -CLEAN_FILES += libraries/integer-gmp/gmp/gmp.h -CLEAN_FILES += libraries/integer-gmp/gmp/libgmp.a - -clean : clean_gmp -.PHONY: clean_gmp -clean_gmp: - "$(RM)" $(RM_OPTS_REC) libraries/integer-gmp/gmp/objs - "$(RM)" $(RM_OPTS_REC) libraries/integer-gmp/gmp/gmpbuild -endif - .PHONY: clean_libraries clean_libraries: $(patsubst %,clean_libraries/%_dist-install,$(PACKAGES) $(PACKAGES_STAGE2)) clean_libraries: $(patsubst %,clean_libraries/%_dist-boot,$(STAGE0_PACKAGES)) -- 1.7.10.4