diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-04-20 12:41:22 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-04-20 13:02:02 +0100 |
| commit | db14f97eb063642d4e7104fef1fa322f7b00c8bc (patch) | |
| tree | 9050f4e22733af739f143957f3c0c476555dce34 /ghc.mk | |
| parent | 54d7902002e2d36305087c0cf2234d890a93e833 (diff) | |
| download | haskell-db14f97eb063642d4e7104fef1fa322f7b00c8bc.tar.gz | |
Some build system refactoring
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 40 |
1 files changed, 20 insertions, 20 deletions
@@ -512,24 +512,6 @@ ALL_STAGE1_LIBS += $(foreach lib,$(PACKAGES_STAGE1),$(libraries/$(lib)_dist-inst endif BOOT_LIBS = $(foreach lib,$(PACKAGES_STAGE0),$(libraries/$(lib)_dist-boot_v_LIB)) -# ----------------------------------------------- -# Haddock-related bits - -# Run Haddock for the packages that will be installed. We need to handle -# compiler specially due to the different dist directory name. -$(foreach p,$(INSTALL_PACKAGES),$(eval $p_dist-install_DO_HADDOCK = YES)) -compiler_stage2_DO_HADDOCK = YES - -# Build the Haddock contents and index -ifeq "$(HADDOCK_DOCS)" "YES" -libraries/dist-haddock/index.html: inplace/bin/haddock$(exeext) $(ALL_HADDOCK_FILES) - cd libraries && sh gen_contents_index --intree -ifeq "$(phase)" "final" -$(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html)) -endif -INSTALL_LIBRARY_DOCS += libraries/dist-haddock/* -endif - # ---------------------------------------- # Special magic for the ghc-prim package @@ -592,8 +574,6 @@ ifeq "$(Windows_Host)" "YES" BUILD_DIRS += utils/touchy endif -BUILD_DIRS += docs/users_guide -BUILD_DIRS += docs/man BUILD_DIRS += utils/unlit BUILD_DIRS += utils/hp2ps @@ -668,6 +648,8 @@ BUILD_DIRS += utils/mkUserGuidePart endif endif +BUILD_DIRS += docs/users_guide +BUILD_DIRS += docs/man BUILD_DIRS += utils/count_lines BUILD_DIRS += utils/compare_sizes @@ -746,6 +728,24 @@ libraries/vector/dist-install/build/Data/Vector/Fusion/Stream/Monadic.$($(way)_o )) endif +# ----------------------------------------------- +# Haddock-related bits + +# Run Haddock for the packages that will be installed. We need to handle +# compiler specially due to the different dist directory name. +$(foreach p,$(INSTALL_PACKAGES),$(eval $p_dist-install_DO_HADDOCK = YES)) +compiler_stage2_DO_HADDOCK = YES + +# Build the Haddock contents and index +ifeq "$(HADDOCK_DOCS)" "YES" +libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES) + cd libraries && sh gen_contents_index --intree +ifeq "$(phase)" "final" +$(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html)) +endif +INSTALL_LIBRARY_DOCS += libraries/dist-haddock/* +endif + # ----------------------------------------------------------------------------- # Creating a local mingw copy on Windows |