X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc.mk;h=5040ff5097c0a90efd6de60a2a0fdff37d8105e3;hp=0d21dcfc73e9a22ab5af5acb7670e60bd2b999b7;hb=ff30c8f61ed7318563a4f9185815e80cf35e363d;hpb=17bd9ff74ab9d5c4ff545d7cec3a6d014590f822 diff --git a/ghc.mk b/ghc.mk index 0d21dcf..5040ff5 100644 --- a/ghc.mk +++ b/ghc.mk @@ -85,11 +85,6 @@ else $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug?) endif -# Just bring makefiles up to date: -.PHONY: just-makefiles -just-makefiles: - @: - ifneq "$(CLEANING)" "YES" CLEANING = NO endif @@ -155,7 +150,7 @@ include rules/clean-target.mk # ----------------------------------------------------------------------------- # The inplace tree -$(eval $(call clean-target,inplace,,inplace)) +$(eval $(call clean-target,inplace,,inplace/bin inplace/lib)) # ----------------------------------------------------------------------------- # Whether to build dependencies or not @@ -299,7 +294,7 @@ DPH_PACKAGES := dph/dph-base dph/dph-prim-interface dph/dph-prim-seq \ # Packages that, if present, must be built by the stage2 compiler, # because they use TH and/or annotations, or depend on other stage2 # packages: -STAGE2_PACKAGES := $(DPH_PACKAGES) haskell98 haskell2010 +STAGE2_PACKAGES := $(DPH_PACKAGES) haskell98 haskell2010 random # Packages that we shouldn't build if we don't have TH (e.g. because # we're building a profiled compiler): TH_PACKAGES := $(DPH_PACKAGES) @@ -435,6 +430,8 @@ ghc/stage2/package-data.mk: compiler/stage2/package-data.mk # package-data.mk is sufficient, as that in turn depends on all the # libraries utils/haddock/dist/package-data.mk: compiler/stage2/package-data.mk +utils/ghc-pwd/dist/package-data.mk: compiler/stage2/package-data.mk +utils/ghc-cabal/dist-install/package-data.mk: compiler/stage2/package-data.mk utils/ghc-pkg/dist-install/package-data.mk: compiler/stage2/package-data.mk utils/hsc2hs/dist-install/package-data.mk: compiler/stage2/package-data.mk @@ -496,21 +493,21 @@ libraries/ghc-prim_dist-install_EXTRA_HADDOCK_SRCS = libraries/ghc-prim/dist-ins ifneq "$(CLEANING)" "YES" ifeq "$(INTEGER_LIBRARY)" "integer-gmp" libraries/base_dist-install_CONFIGURE_OPTS += --flags=-integer-simple +else ifeq "$(INTEGER_LIBRARY)" "integer-simple" +libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple else - ifeq "$(INTEGER_LIBRARY)" "integer-simple" - libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple - else $(error Unknown integer library: $(INTEGER_LIBRARY)) - endif endif endif # ---------------------------------------------- # Checking packages with 'cabal check' +ifeq "$(phase)" "" ifeq "$(CHECK_PACKAGES)" "YES" all: check_packages endif +endif # These packages don't pass the Cabal checks because hs-source-dirs # points outside the source directory. This isn't a real problem in @@ -525,40 +522,6 @@ CHECKED_compiler = YES # ----------------------------------------------------------------------------- # Include build instructions from all subdirs -# For the rationale behind the build phases, see -# http://hackage.haskell.org/trac/ghc/wiki/Building/Architecture/Idiom/PhaseOrdering - -# Setting foo_dist_DISABLE=YES means "in directory foo, for build -# "dist", just read the package-data.mk file, do not build anything". - -# We carefully engineer things so that we can build the -# package-data.mk files early on: they depend only on a few tools also -# built early. Having got the package-data.mk files built, we can -# restart make with up-to-date information about all the packages -# (this is phase 0). The remaining problem is the .depend files: -# -# - .depend files in libraries need the stage 1 compiler to build -# - ghc/stage1/.depend needs compiler/stage1 built -# - compiler/stage1/.depend needs the bootstrap libs built -# -# GHC 6.11+ can build a .depend file without having built the -# dependencies of the package, but we can't rely on the bootstrapping -# compiler being able to do this, which is why we have to separate the -# three phases above. - -# So this is the final ordering: - -# Phase 0 : all package-data.mk files -# (requires ghc-cabal, ghc-pkg, mkdirhier, dummy-ghc etc.) -# Phase 1 : .depend files for bootstrap libs -# (requires hsc2hs) -# Phase 2 : compiler/stage1/.depend -# (requires bootstrap libs and genprimopcode) -# Phase 3 : ghc/stage1/.depend -# (requires compiler/stage1) -# -# The rest : libraries/*/dist-install, compiler/stage2, ghc/stage2 - ifneq "$(BINDIST)" "YES" BUILD_DIRS += \ $(GHC_MKDIRHIER_DIR) @@ -594,14 +557,9 @@ BUILD_DIRS += \ ifneq "$(BINDIST)" "YES" BUILD_DIRS += \ bindisttest \ - $(GHC_CABAL_DIR) \ $(GHC_GENAPPLY_DIR) endif -BUILD_DIRS += \ - utils/haddock \ - utils/haddock/doc - ifneq "$(CLEANING)" "YES" BUILD_DIRS += \ $(patsubst %, libraries/%, $(PACKAGES)) @@ -609,14 +567,20 @@ 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 += \ + utils/haddock \ + utils/haddock/doc \ compiler \ $(GHC_HSC2HS_DIR) \ $(GHC_PKG_DIR) \ utils/testremove \ utils/ghctags \ + utils/ghc-pwd \ + $(GHC_CABAL_DIR) \ utils/hpc \ utils/runghc \ ghc @@ -639,40 +603,71 @@ BUILD_DIRS += \ $(patsubst %, libraries/%, $(PACKAGES_STAGE2)) endif -# XXX libraries/% must come before any programs built with stage1, see -# Note [lib-depends]. +# ----------------------------------------------------------------------------- +# Phase handling -ifeq "$(phase)" "0" -$(foreach lib,$(STAGE0_PACKAGES),$(eval \ - libraries/$(lib)_dist-boot_DISABLE = YES)) +phase_0_or_later = YES +ifeq "$(findstring $(phase),0)" "" +phase_0_done = YES +phase_1_or_later = YES endif - -ifneq "$(findstring $(phase),0 1)" "" -# We can build deps for compiler/stage1 in phase 2 -compiler_stage1_DISABLE = YES +ifeq "$(findstring $(phase),0 1)" "" +phase_1_done = YES +phase_2_or_later = YES endif - -ifneq "$(findstring $(phase),0 1 2)" "" -ghc_stage1_DISABLE = YES +ifeq "$(findstring $(phase),0 1 2)" "" +phase_2_done = YES +phase_3_or_later = YES +endif +ifeq "$(findstring $(phase),0 1 2 3)" "" +phase_3_done = YES endif -ifneq "$(findstring $(phase),0 1 2 3)" "" -# In phases 0-3, we disable stage2-3, the full libraries and haddock -utils/haddock_dist_DISABLE = YES -utils/runghc_dist_DISABLE = YES -utils/ghctags_dist_DISABLE = YES -utils/hpc_dist_DISABLE = YES -utils/hsc2hs_dist-install_DISABLE = YES -utils/ghc-pkg_dist-install_DISABLE = YES -utils/mkUserGuidePart_dist_DISABLE = YES -utils/compare_sizes_dist_DISABLE = YES -compiler_stage2_DISABLE = YES -compiler_stage3_DISABLE = YES -ghc_stage2_DISABLE = YES -ghc_stage3_DISABLE = YES +includes_dist-derivedconstants_CONFIGURE_PHASE = 0 +includes_dist-ghcconstants_CONFIGURE_PHASE = 0 + +# We do these first, as making the sources for some later +# packages needs them, and we need the sources before we can +# work out dependencies +utils/hsc2hs_dist_CONFIGURE_PHASE = 0 +utils/unlit_dist_CONFIGURE_PHASE = 0 +utils/genprimopcode_dist_CONFIGURE_PHASE = 0 + +# Then the bootlibs +$(foreach lib,$(STAGE0_PACKAGES),$(eval \ + libraries/$(lib)_dist-boot_CONFIGURE_PHASE = 1)) +compiler_stage1_CONFIGURE_PHASE = 1 +ghc_stage1_CONFIGURE_PHASE = 1 +driver/ghc_dist_CONFIGURE_PHASE = 1 +driver/ghci_dist_CONFIGURE_PHASE = 1 +driver/haddock_dist_CONFIGURE_PHASE = 1 +utils/touchy_dist_CONFIGURE_PHASE = 1 + +# In phase 2, the phase 1 things actually get built + +# Finally, the stage1 compiler is used to make the dependencies for +# everything else, so we can now build the rest. +compiler_stage2_CONFIGURE_PHASE = 3 +ghc_stage2_CONFIGURE_PHASE = 3 + $(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \ - libraries/$(lib)_dist-install_DISABLE = YES)) -endif + libraries/$(lib)_dist-install_CONFIGURE_PHASE = 3)) + +utils/hp2ps_dist_CONFIGURE_PHASE = 3 +utils/genapply_dist_CONFIGURE_PHASE = 3 +utils/haddock_dist_CONFIGURE_PHASE = 3 +utils/hsc2hs_dist-install_CONFIGURE_PHASE = 3 +utils/ghc-pkg_dist-install_CONFIGURE_PHASE = 3 +utils/hpc_dist_CONFIGURE_PHASE = 3 +utils/runghc_dist_CONFIGURE_PHASE = 3 +utils/ghctags_dist_CONFIGURE_PHASE = 3 +utils/ghc-pwd_dist_CONFIGURE_PHASE = 3 +utils/ghc-cabal_dist-install_CONFIGURE_PHASE = 3 +utils/mkUserGuidePart_dist_CONFIGURE_PHASE = 3 +utils/compare_sizes_dist_CONFIGURE_PHASE = 3 + +# ---------------------------------------------- +# Actually include all the sub-ghc.mk's include $(patsubst %, %/ghc.mk, $(BUILD_DIRS)) @@ -706,9 +701,11 @@ $(foreach p,$(STAGE0_PACKAGES),$(eval libraries/$p_dist-boot_DO_HADDOCK = NO)) # Build the Haddock contents and index ifeq "$(HADDOCK_DOCS)" "YES" -libraries/index.html: $(ALL_HADDOCK_FILES) +libraries/index.html: inplace/bin/haddock $(ALL_HADDOCK_FILES) cd libraries && sh gen_contents_index --inplace +ifeq "$(phase)" "" $(eval $(call all-target,library_doc_index,libraries/index.html)) +endif INSTALL_LIBRARY_DOCS += libraries/*.html libraries/*.gif libraries/*.css libraries/*.js CLEAN_FILES += libraries/doc-index* libraries/haddock*.css \ libraries/haddock*.js libraries/index*.html libraries/*.gif @@ -745,25 +742,7 @@ $(eval $(call build-package,libraries/bin-package-db,dist-boot,0)) fixed_pkg_prev= $(foreach pkg,$(STAGE0_PACKAGES),$(eval $(call fixed_pkg_dep,$(pkg),dist-boot))) -compiler/stage1/package-data.mk : \ - libraries/Cabal/dist-boot/package-data.mk \ - libraries/hpc/dist-boot/package-data.mk \ - libraries/extensible-exceptions/dist-boot/package-data.mk \ - libraries/bin-package-db/dist-boot/package-data.mk - -# These are necessary because the bootstrapping compiler may not know -# about cross-package dependencies: -$(compiler_stage1_depfile_haskell) : $(BOOT_LIBS) -$(ghc_stage1_depfile_haskell) : $(compiler_stage1_v_LIB) - -# A few careful dependencies between bootstrapping packages. When we -# can rely on the stage 0 compiler being able to generate -# cross-package dependencies with -M (fixed in GHC 6.12.1) we can drop -# these, and also some of the phases. -# -# If you miss any out here, then 'make -j8' will probably tell you. -# -libraries/bin-package-db/dist-boot/build/Distribution/InstalledPackageInfo/Binary.$(v_osuf) : libraries/binary/dist-boot/build/Data/Binary.$(v_hisuf) libraries/Cabal/dist-boot/build/Distribution/InstalledPackageInfo.$(v_hisuf) +compiler/stage1/package-data.mk : $(fixed_pkg_prev) # Make sure we have all the GHCi libs by the time we've built # ghc-stage2. DPH includes a bit of Template Haskell which needs the @@ -832,26 +811,26 @@ install: install_docs endif install_bins: $(INSTALL_BINS) - $(INSTALL_DIR) "$(DESTDIR)$(bindir)" + $(call INSTALL_DIR,"$(DESTDIR)$(bindir)") for i in $(INSTALL_BINS); do \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(bindir)" ; \ + $(call INSTALL_PROGRAM,$(INSTALL_BIN_OPTS),$$i,"$(DESTDIR)$(bindir)") ; \ done install_libs: $(INSTALL_LIBS) - $(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)" + $(call INSTALL_DIR,"$(DESTDIR)$(ghclibdir)") for i in $(INSTALL_LIBS); do \ case $$i in \ *.a) \ - $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \ + $(call INSTALL_DATA,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibdir)"); \ $(RANLIB) $(DESTDIR)$(ghclibdir)/`basename $$i` ;; \ *.dll) \ - $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)" ;; \ + $(call INSTALL_DATA,-s $(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibdir)") ;; \ *.so) \ - $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)" ;; \ + $(call INSTALL_SHLIB,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibdir)") ;; \ *.dylib) \ - $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)";; \ + $(call INSTALL_SHLIB,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibdir)");; \ *) \ - $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \ + $(call INSTALL_DATA,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibdir)"); \ esac; \ done @@ -859,9 +838,9 @@ install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS) ifeq "$(INSTALL_LIBEXEC_SCRIPTS)" "" @: else - $(INSTALL_DIR) "$(DESTDIR)$(ghclibexecdir)" + $(call INSTALL_DIR,"$(DESTDIR)$(ghclibexecdir)") for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ - $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibexecdir)"; \ + $(call INSTALL_SCRIPT,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghclibexecdir)"); \ done endif @@ -869,9 +848,9 @@ install_libexecs: $(INSTALL_LIBEXECS) ifeq "$(INSTALL_LIBEXECS)" "" @: else - $(INSTALL_DIR) "$(DESTDIR)$(ghclibexecdir)" + $(call INSTALL_DIR,"$(DESTDIR)$(ghclibexecdir)") for i in $(INSTALL_LIBEXECS); do \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(ghclibexecdir)"; \ + $(call INSTALL_PROGRAM,$(INSTALL_BIN_OPTS),$$i,"$(DESTDIR)$(ghclibexecdir)"); \ done # We rename ghc-stage2, so that the right program name is used in error # messages etc. @@ -879,38 +858,38 @@ else endif install_topdirs: $(INSTALL_TOPDIRS) - $(INSTALL_DIR) "$(DESTDIR)$(topdir)" + $(call INSTALL_DIR,"$(DESTDIR)$(topdir)") for i in $(INSTALL_TOPDIRS); do \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(topdir)"; \ + $(call INSTALL_PROGRAM,$(INSTALL_BIN_OPTS),$$i,"$(DESTDIR)$(topdir)"); \ done install_headers: $(INSTALL_HEADERS) - $(INSTALL_DIR) "$(DESTDIR)$(ghcheaderdir)" + $(call INSTALL_DIR,"$(DESTDIR)$(ghcheaderdir)") for i in $(INSTALL_HEADERS); do \ - $(INSTALL_HEADER) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghcheaderdir)"; \ + $(call INSTALL_HEADER,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(ghcheaderdir)"); \ done install_docs: $(INSTALL_DOCS) - $(INSTALL_DIR) "$(DESTDIR)$(docdir)" + $(call INSTALL_DIR,"$(DESTDIR)$(docdir)") ifneq "$(INSTALL_DOCS)" "" for i in $(INSTALL_DOCS); do \ - $(INSTALL_DOC) $(INSTALL_OPTS) $$i "$(DESTDIR)$(docdir)"; \ + $(call INSTALL_DOC,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(docdir)"); \ done endif - $(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html" - $(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html" + $(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html") + $(call INSTALL_DOC,$(INSTALL_OPTS),docs/index.html,"$(DESTDIR)$(docdir)/html") ifneq "$(INSTALL_LIBRARY_DOCS)" "" - $(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html/libraries" + $(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html/libraries") for i in $(INSTALL_LIBRARY_DOCS); do \ - $(INSTALL_DOC) $(INSTALL_OPTS) $$i "$(DESTDIR)$(docdir)/html/libraries/"; \ + $(call INSTALL_DOC,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(docdir)/html/libraries/"); \ done - $(INSTALL_DATA) $(INSTALL_OPTS) libraries/prologue.txt "$(DESTDIR)$(docdir)/html/libraries/" - $(INSTALL_SCRIPT) $(INSTALL_OPTS) libraries/gen_contents_index "$(DESTDIR)$(docdir)/html/libraries/" + $(call INSTALL_DATA,$(INSTALL_OPTS),libraries/prologue.txt,"$(DESTDIR)$(docdir)/html/libraries/") + $(call INSTALL_SCRIPT,$(INSTALL_OPTS),libraries/gen_contents_index,"$(DESTDIR)$(docdir)/html/libraries/") endif ifneq "$(INSTALL_HTML_DOC_DIRS)" "" for i in $(INSTALL_HTML_DOC_DIRS); do \ - $(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html/`basename $$i`"; \ - $(INSTALL_DOC) $(INSTALL_OPTS) $$i/* "$(DESTDIR)$(docdir)/html/`basename $$i`"; \ + $(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html/`basename $$i`"); \ + $(call INSTALL_DOC,$(INSTALL_OPTS),$$i/*,"$(DESTDIR)$(docdir)/html/`basename $$i`"); \ done endif @@ -944,9 +923,9 @@ INSTALL_DISTDIR_compiler = stage2 # Now we can do the installation install_packages: install_libexecs install_packages: libffi/package.conf.install rts/package.conf.install - $(INSTALL_DIR) "$(DESTDIR)$(topdir)" + $(call INSTALL_DIR,"$(DESTDIR)$(topdir)") "$(RM)" $(RM_OPTS_REC) "$(INSTALLED_PACKAGE_CONF)" - $(INSTALL_DIR) "$(INSTALLED_PACKAGE_CONF)" + $(call INSTALL_DIR,"$(INSTALLED_PACKAGE_CONF)") "$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update libffi/package.conf.install "$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update rts/package.conf.install $(foreach p, $(INSTALLED_PKG_DIRS), \ @@ -984,8 +963,8 @@ $(eval $(call bindist,.,\ Makefile \ mk/config.mk.in \ $(INPLACE_BIN)/mkdirhier \ - $(INPLACE_BIN)/ghc-cabal \ - utils/ghc-pwd/ghc-pwd \ + utils/ghc-cabal/dist-install/build/tmp/ghc-cabal \ + utils/ghc-pwd/dist/build/tmp/ghc-pwd \ $(BINDIST_WRAPPERS) \ $(BINDIST_PERL_SOURCES) \ $(BINDIST_LIBS) \ @@ -1037,6 +1016,7 @@ unix-binary-dist-prep: echo "BUILD_DOCBOOK_PS = $(BUILD_DOCBOOK_PS)" >> $(BIN_DIST_MK) echo "BUILD_DOCBOOK_PDF = $(BUILD_DOCBOOK_PDF)" >> $(BIN_DIST_MK) echo "BUILD_MAN = $(BUILD_MAN)" >> $(BIN_DIST_MK) + echo "GHC_CABAL_INPLACE = utils/ghc-cabal/dist-install/build/tmp/ghc-cabal" >> $(BIN_DIST_MK) cd $(BIN_DIST_PREP_DIR) && autoreconf "$(RM)" $(RM_OPTS) $(BIN_DIST_PREP_TAR) # h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source @@ -1076,9 +1056,15 @@ ifeq "$(mingw32_TARGET_OS)" "1" $(call try10Times,$(PublishCp) $(WINDOWS_INSTALLER) $(PublishLocation)/dist) endif +ifeq "$(mingw32_TARGET_OS)" "1" +DOCDIR_TO_PUBLISH = bindisttest/"install dir"/doc +else +DOCDIR_TO_PUBLISH = bindisttest/"install dir"/share/doc/ghc +endif + .PHONY: publish-docs publish-docs: - $(call try10Times,$(PublishCp) -r bindisttest/installed/share/doc/ghc/* $(PublishLocation)/docs) + $(call try10Times,$(PublishCp) -r $(DOCDIR_TO_PUBLISH)/* $(PublishLocation)/docs) # ----------------------------------------------------------------------------- # Source distributions @@ -1103,7 +1089,7 @@ publish-docs: # Directory in which we're going to build the src dist # SRC_DIST_NAME=ghc-$(ProjectVersion) -SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME) +SRC_DIST_DIR=$(TOP)/$(SRC_DIST_NAME) # # Files to include in source distributions @@ -1193,10 +1179,6 @@ sdist_%: .PHONY: clean -CLEAN_FILES += utils/ghc-pwd/ghc-pwd -CLEAN_FILES += utils/ghc-pwd/ghc-pwd.exe -CLEAN_FILES += utils/ghc-pwd/ghc-pwd.hi -CLEAN_FILES += utils/ghc-pwd/ghc-pwd.o CLEAN_FILES += libraries/bootstrapping.conf CLEAN_FILES += libraries/integer-gmp/cbits/GmpDerivedConstants.h CLEAN_FILES += libraries/integer-gmp/cbits/mkGmpDerivedConstants @@ -1207,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)) @@ -1250,6 +1221,8 @@ distclean : clean "$(RM)" $(RM_OPTS) libraries/process/include/HsProcessConfig.h "$(RM)" $(RM_OPTS) libraries/unix/include/HsUnixConfig.h "$(RM)" $(RM_OPTS) libraries/old-time/include/HsTimeConfig.h + "$(RM)" $(RM_OPTS_REC) utils/ghc-pwd/dist + "$(RM)" $(RM_OPTS_REC) inplace "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.log, $(PACKAGES) $(PACKAGES_STAGE2)) "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.status, $(PACKAGES) $(PACKAGES_STAGE2))