Commit 6bd4017c authored by ian@well-typed.com's avatar ian@well-typed.com

Make ghc.mk a little prettier

parent 77d1a44a
...@@ -587,29 +587,24 @@ endif ...@@ -587,29 +587,24 @@ endif
# variables defined by their dependencies # variables defined by their dependencies
ifneq "$(BINDIST)" "YES" ifneq "$(BINDIST)" "YES"
BUILD_DIRS += \ BUILD_DIRS += $(GHC_MKDIRHIER_DIR)
$(GHC_MKDIRHIER_DIR)
endif endif
ifeq "$(Windows_Host)" "YES" ifeq "$(Windows_Host)" "YES"
BUILD_DIRS += \ BUILD_DIRS += $(GHC_TOUCHY_DIR)
$(GHC_TOUCHY_DIR)
endif endif
BUILD_DIRS += \ BUILD_DIRS += docs/users_guide
docs/users_guide \ BUILD_DIRS += docs/man
docs/man \ BUILD_DIRS += $(GHC_UNLIT_DIR)
$(GHC_UNLIT_DIR) \ BUILD_DIRS += $(GHC_HP2PS_DIR)
$(GHC_HP2PS_DIR)
ifneq "$(GhcUnregisterised)" "YES" ifneq "$(GhcUnregisterised)" "YES"
BUILD_DIRS += \ BUILD_DIRS += $(GHC_SPLIT_DIR)
$(GHC_SPLIT_DIR)
endif endif
ifneq "$(BINDIST)" "YES" ifneq "$(BINDIST)" "YES"
BUILD_DIRS += \ BUILD_DIRS += $(GHC_GENPRIMOP_DIR)
$(GHC_GENPRIMOP_DIR)
endif endif
ifeq "$(Stage1Only)-$(phase)" "YES-final" ifeq "$(Stage1Only)-$(phase)" "YES-final"
...@@ -618,24 +613,21 @@ else ...@@ -618,24 +613,21 @@ else
MAYBE_GHCI=driver/ghci MAYBE_GHCI=driver/ghci
endif endif
BUILD_DIRS += \ BUILD_DIRS += driver
driver \ BUILD_DIRS += $(MAYBE_GHCI)
$(MAYBE_GHCI) \ BUILD_DIRS += driver/ghc
driver/ghc \ BUILD_DIRS += driver/haddock
driver/haddock \ BUILD_DIRS += libffi
libffi \ BUILD_DIRS += includes
includes \ BUILD_DIRS += rts
rts
ifneq "$(BINDIST)" "YES" ifneq "$(BINDIST)" "YES"
BUILD_DIRS += \ BUILD_DIRS += bindisttest
bindisttest \ BUILD_DIRS += $(GHC_GENAPPLY_DIR)
$(GHC_GENAPPLY_DIR)
endif endif
ifneq "$(CLEANING)" "YES" ifneq "$(CLEANING)" "YES"
BUILD_DIRS += \ BUILD_DIRS += $(patsubst %, libraries/%, $(PACKAGES_STAGE1))
$(patsubst %, libraries/%, $(PACKAGES_STAGE1))
endif endif
...@@ -655,31 +647,28 @@ MAYBE_HPC=utils/hpc ...@@ -655,31 +647,28 @@ MAYBE_HPC=utils/hpc
MAYBE_RUNGHC=utils/runghc MAYBE_RUNGHC=utils/runghc
endif endif
BUILD_DIRS += \ BUILD_DIRS += utils/haddock
utils/haddock \ BUILD_DIRS += utils/haddock/doc
utils/haddock/doc \ BUILD_DIRS += compiler
compiler \ BUILD_DIRS += $(GHC_HSC2HS_DIR)
$(GHC_HSC2HS_DIR) \ BUILD_DIRS += $(GHC_PKG_DIR)
$(GHC_PKG_DIR) \ BUILD_DIRS += utils/deriveConstants
utils/deriveConstants \ BUILD_DIRS += utils/testremove
utils/testremove \ BUILD_DIRS += $(MAYBE_GHCTAGS)
$(MAYBE_GHCTAGS) \ BUILD_DIRS += utils/ghc-pwd
utils/ghc-pwd \ BUILD_DIRS += $(GHC_CABAL_DIR)
$(GHC_CABAL_DIR) \ BUILD_DIRS += $(MAYBE_HPC)
$(MAYBE_HPC) \ BUILD_DIRS += $(MAYBE_RUNGHC)
$(MAYBE_RUNGHC) \ BUILD_DIRS += ghc
ghc
ifneq "$(CLEANING)" "YES" ifneq "$(CLEANING)" "YES"
BUILD_DIRS += \ BUILD_DIRS += $(patsubst %, libraries/%, $(PACKAGES_STAGE2))
$(patsubst %, libraries/%, $(PACKAGES_STAGE2)) \ BUILD_DIRS += libraries/dph
libraries/dph
endif endif
ifneq "$(BINDIST)" "YES" ifneq "$(BINDIST)" "YES"
ifneq "$(CrossCompiling)-$(phase)" "YES-final" ifneq "$(CrossCompiling)-$(phase)" "YES-final"
BUILD_DIRS += \ BUILD_DIRS += utils/mkUserGuidePart
utils/mkUserGuidePart
endif endif
endif endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment