X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=066d1b686acee84a87a2d2b94e95dd2810a2cbb6;hb=4a84e214da8a2d87d2fd819d59fb06115e98014c;hp=b6df093d335bd738ddd1d04d454a68511166d86b;hpb=0bde11509ca13d4d0914496ee652d7c2b43a0420;p=ghc-hetmet.git diff --git a/ghc.mk b/ghc.mk index b6df093..066d1b6 100644 --- a/ghc.mk +++ b/ghc.mk @@ -13,8 +13,6 @@ # ToDo List. # # * finish installation -# * other documentation -# * create doc index and contents # * Windows: should we have ghc-pkg-? # * should we be stripping things? # * install libgmp.a, gmp.h @@ -29,9 +27,7 @@ # * docs/vh/Makefile # * rts/dotnet/Makefile # * utils/Makefile -# * GhcProfiled # * optionally install stage3? -# * shared libraries, way dyn # * add Makefiles for the rest of the utils/ programs that aren't built # by default (need to exclude them from 'make all' too) # @@ -282,45 +278,56 @@ include rules/bindist.mk # ----------------------------------------------------------------------------- # Building libraries -# XXX generate from $(TOP)/packages -PACKAGES = \ - ghc-prim \ - integer-gmp \ - integer \ - base \ - filepath \ - array \ - bytestring \ - containers +define addPackage # args: $1 = package, $2 = condition + ifneq "$2" "" + ifeq "$$(CLEANING)" "YES" + PACKAGES += $1 + else + ifeq $2 + PACKAGES += $1 + endif + endif + else + PACKAGES += $1 + endif +endef -ifeq "$(Windows)" "YES" -PACKAGES += Win32 +$(eval $(call addPackage,ghc-prim)) +ifeq "$(CLEANING)" "YES" +$(eval $(call addPackage,integer-gmp)) +$(eval $(call addPackage,integer-simple)) else -PACKAGES += unix -endif - -PACKAGES += \ - old-locale \ - old-time \ - directory \ - process \ - random \ - extensible-exceptions \ - haskell98 \ - hpc \ - pretty \ - syb \ - template-haskell \ - base3-compat \ - Cabal \ - mtl \ - utf8-string - -ifneq "$(Windows)" "YES" -PACKAGES += terminfo +$(eval $(call addPackage,$(INTEGER_LIBRARY))) endif - -PACKAGES += haskeline +$(eval $(call addPackage,base)) +$(eval $(call addPackage,filepath)) +$(eval $(call addPackage,array)) +$(eval $(call addPackage,bytestring)) +$(eval $(call addPackage,containers)) + +$(eval $(call addPackage,Win32,($$(Windows),YES))) +$(eval $(call addPackage,unix,($$(Windows),NO))) + +$(eval $(call addPackage,old-locale)) +$(eval $(call addPackage,old-time)) +$(eval $(call addPackage,time)) +$(eval $(call addPackage,directory)) +$(eval $(call addPackage,process)) +$(eval $(call addPackage,random)) +$(eval $(call addPackage,extensible-exceptions)) +$(eval $(call addPackage,haskell98)) +$(eval $(call addPackage,hpc)) +$(eval $(call addPackage,pretty)) +$(eval $(call addPackage,syb)) +$(eval $(call addPackage,template-haskell)) +$(eval $(call addPackage,base3-compat)) +$(eval $(call addPackage,Cabal)) +$(eval $(call addPackage,mtl)) +$(eval $(call addPackage,utf8-string)) + +$(eval $(call addPackage,terminfo,($$(Windows),NO))) + +$(eval $(call addPackage,haskeline)) ifneq "$(BootingFromHc)" "YES" PACKAGES_STAGE2 += \ @@ -498,8 +505,11 @@ BUILD_DIRS += \ endif endif +ifeq "$(INTEGER_LIBRARY)" "integer-gmp" +BUILD_DIRS += libraries/integer-gmp/gmp +endif + BUILD_DIRS += \ - libraries/integer-gmp/gmp \ compiler \ $(GHC_HSC2HS_DIR) \ $(GHC_PKG_DIR) \ @@ -528,6 +538,18 @@ ifneq "$(findstring $(phase),0 1 2)" "" ghc_stage1_DISABLE = YES endif +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 +$(error Unknown integer library: $(INTEGER_LIBRARY)) + endif +endif +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 @@ -543,6 +565,14 @@ $(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \ libraries/$(lib)_dist-install_DISABLE = YES)) 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 +# these cases, so we just skip checking them. +CHECKED_libraries/dph/dph-seq = YES +CHECKED_libraries/dph/dph-par = YES +# In compiler's case, include-dirs points outside of the source tree +CHECKED_compiler = YES + include $(patsubst %, %/ghc.mk, $(BUILD_DIRS)) # We need -fno-warn-deprecated-flags to avoid failure with -Werror @@ -567,6 +597,17 @@ libraries/base3-compat_dist-install_HC_OPTS += -XPackageImports .PHONY: stage1_libs stage1_libs : $(ALL_STAGE1_LIBS) +ifeq "$(HADDOCK_DOCS)" "YES" +libraries/index.html: $(ALL_HADDOCK_FILES) + cd libraries && sh gen_contents_index --inplace +$(eval $(call all-target,library_doc_index,libraries/index.html)) +INSTALL_LIBRARY_DOCS += libraries/*.html libraries/*.gif libraries/*.css libraries/*.js +endif + +ifeq "$(CHECK_PACKAGES)" "YES" +all: check_packages +endif + # ----------------------------------------------------------------------------- # Bootstrapping libraries @@ -655,68 +696,98 @@ libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs: \ # Installation install: install_packages install_libs install_libexecs install_headers \ - install_libexec_scripts install_bins + install_libexec_scripts install_bins install_docs \ + install_topdirs install_topdir_scripts install_bins: $(INSTALL_BINS) $(INSTALL_DIR) $(DESTDIR)$(bindir) for i in $(INSTALL_BINS); do \ $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(bindir) ; \ if test "$(darwin_TARGET_OS)" = "1"; then \ - sh mk/fix_install_names.sh $(libdir) $(DESTDIR)$(bindir)/$$i ; \ + sh mk/fix_install_names.sh $(ghclibdir) $(DESTDIR)$(bindir)/$$i ; \ fi ; \ done install_libs: $(INSTALL_LIBS) - $(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_DIR) $(DESTDIR)$(ghclibdir) for i in $(INSTALL_LIBS); do \ case $$i in \ *.a) \ - $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir); \ - $(RANLIB) $(DESTDIR)$(libdir)/`basename $$i` ;; \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir); \ + $(RANLIB) $(DESTDIR)$(ghclibdir)/`basename $$i` ;; \ *.dll) \ - $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir) ;; \ + $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir) ;; \ *.so) \ - $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir) ;; \ + $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir) ;; \ *.dylib) \ - $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir); \ - install_name_tool -id $(DESTDIR)$(libdir)/`basename $$i` $(DESTDIR)$(libdir)/`basename $$i` ;; \ + $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir); \ + install_name_tool -id $(DESTDIR)$(ghclibdir)/`basename $$i` $(DESTDIR)$(ghclibdir)/`basename $$i` ;; \ *) \ - $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir); \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir); \ esac; \ done install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS) - "$(MKDIRHIER)" $(DESTDIR)$(libexecdir) + $(INSTALL_DIR) $(DESTDIR)$(ghclibexecdir) for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ - $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(libexecdir); \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \ done install_libexecs: $(INSTALL_LIBEXECS) - "$(MKDIRHIER)" $(DESTDIR)$(libexecdir) + $(INSTALL_DIR) $(DESTDIR)$(ghclibexecdir) for i in $(INSTALL_LIBEXECS); do \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(libexecdir); \ + $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \ + done + +install_topdir_scripts: $(INSTALL_TOPDIR_SCRIPTS) + $(INSTALL_DIR) $(DESTDIR)$(topdir) + for i in $(INSTALL_TOPDIR_SCRIPTS); do \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(topdir); \ + done + +install_topdirs: $(INSTALL_TOPDIRS) + $(INSTALL_DIR) $(DESTDIR)$(topdir) + for i in $(INSTALL_TOPDIRS); do \ + $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(topdir); \ done install_headers: $(INSTALL_HEADERS) - $(INSTALL_DIR) $(DESTDIR)$(headerdir) + $(INSTALL_DIR) $(DESTDIR)$(ghcheaderdir) for i in $(INSTALL_HEADERS); do \ - $(INSTALL_HEADER) $(INSTALL_OPTS) $$i $(DESTDIR)$(headerdir); \ + $(INSTALL_HEADER) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghcheaderdir); \ done -INSTALLED_PACKAGE_CONF=$(DESTDIR)$(libdir)/package.conf +install_docs: $(INSTALL_HEADERS) + $(INSTALL_DIR) $(DESTDIR)$(docdir) + for i in $(INSTALL_DOCS); do \ + $(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir); \ + done + $(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html; \ + $(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html $(DESTDIR)$(docdir)/html; \ + for i in $(INSTALL_LIBRARY_DOCS); do \ + $(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir)/html/libraries/; \ + done + 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`; \ + done + +INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf # Install packages in the right order, so that ghc-pkg doesn't complain. # Also, install ghc-pkg first. ifeq "$(Windows)" "NO" -INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(libexecdir)/ghc-pkg +INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/ghc-pkg else INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe endif install_packages: install_libexecs install_packages: libffi/package.conf.install rts/package.conf.install - "$(MKDIRHIER)" $(DESTDIR)$(libdir) - echo "[]" > $(INSTALLED_PACKAGE_CONF) + $(INSTALL_DIR) $(DESTDIR)$(topdir) + "$(RM)" $(RM_OPTS) $(INSTALLED_PACKAGE_CONF) + $(CREATE_DATA) $(INSTALLED_PACKAGE_CONF) + echo "[]" >> $(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, $(PACKAGES) $(PACKAGES_STAGE2),\ @@ -724,17 +795,18 @@ install_packages: libffi/package.conf.install rts/package.conf.install $(INSTALLED_GHC_PKG_REAL) \ $(INSTALLED_PACKAGE_CONF) \ libraries/$p dist-install \ - '$(DESTDIR)' '$(prefix)' '$(libdir)' '$(docdir)/libraries' &&) true + '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' &&) true "$(GHC_CABAL_INPLACE)" install \ $(INSTALLED_GHC_PKG_REAL) \ $(INSTALLED_PACKAGE_CONF) \ compiler stage2 \ - '$(DESTDIR)' '$(prefix)' '$(libdir)' '$(docdir)/libraries' + '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' # ----------------------------------------------------------------------------- # Binary distributions -$(eval $(call bindist,.,\ +# This is split in 2 because of the shell argument limit +$(eval $(call bindist,root1,\ LICENSE \ configure config.sub config.guess install-sh \ extra-gcc-opts.in \ @@ -750,20 +822,38 @@ $(eval $(call bindist,.,\ $(INSTALL_HEADERS) \ $(INSTALL_LIBEXECS) \ $(INSTALL_LIBEXEC_SCRIPTS) \ + $(INSTALL_TOPDIRS) \ + $(INSTALL_TOPDIR_SCRIPTS) \ $(INSTALL_BINS) \ + $(INSTALL_DOCS) \ + $(INSTALL_LIBRARY_DOCS) \ + )) +$(eval $(call bindist,root2,\ + $(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \ + docs/index.html \ + $(wildcard libraries/*/dist-install/doc/) \ $(filter-out extra-gcc-opts,$(INSTALL_LIBS)) \ - $(filter-out %/project.mk,$(filter-out mk/config.mk,$(MAKEFILE_LIST))) \ + $(filter-out %/project.mk mk/config.mk %/mk/install.mk,$(MAKEFILE_LIST)) \ mk/fix_install_names.sh \ mk/project.mk \ + mk/install.mk.in \ + bindist.mk \ libraries/dph/LICENSE \ )) # mk/project.mk gets an absolute path, so we manually include it in # the bindist with a relative path +BIN_DIST_MK = $(BIN_DIST_NAME)/bindist.mk + binary-dist: "$(RM)" $(RM_OPTS) -r $(BIN_DIST_NAME) mkdir $(BIN_DIST_NAME) set -e; for i in LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace; do ln -s ../$$i $(BIN_DIST_NAME)/; done + echo "HADDOCK_DOCS = $(HADDOCK_DOCS)" >> $(BIN_DIST_MK) + echo "LATEX_DOCS = $(LATEX_DOCS)" >> $(BIN_DIST_MK) + echo "BUILD_DOCBOOK_HTML = $(BUILD_DOCBOOK_HTML)" >> $(BIN_DIST_MK) + echo "BUILD_DOCBOOK_PS = $(BUILD_DOCBOOK_PS)" >> $(BIN_DIST_MK) + echo "BUILD_DOCBOOK_PDF = $(BUILD_DOCBOOK_PDF)" >> $(BIN_DIST_MK) ln -s ../distrib/configure-bin.ac $(BIN_DIST_NAME)/configure.ac cd $(BIN_DIST_NAME) && autoreconf "$(RM)" $(RM_OPTS) $(BIN_DIST_TAR) @@ -788,6 +878,10 @@ ifeq "$(mingw32_TARGET_OS)" "1" $(call nTimes,10,$(PublishCp) $(WINDOWS_INSTALLER) $(PublishLocation)/dist) endif +.PHONY: publish-docs +publish-docs: + $(call nTimes,10,$(PublishCp) -r bindisttest/installed/share/doc/ghc/* $(PublishLocation)/docs) + # ----------------------------------------------------------------------------- # Source distributions @@ -883,7 +977,7 @@ publish-sdist : $(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist) endif -ifeq "$(GhcUnregisterised)" "YES" +ifeq "$(BootingFromUnregisterisedHc)" "YES" SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER -D__GLASGOW_HASKELL__=$(ProjectVersionInt) endif @@ -897,13 +991,21 @@ 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/gmp/gmp.h +CLEAN_FILES += libraries/integer-gmp/gmp/libgmp.a +CLEAN_FILES += libraries/integer-gmp/cbits/GmpDerivedConstants.h +CLEAN_FILES += libraries/integer-gmp/cbits/mkGmpDerivedConstants -clean : clean_files clean_libraries +clean : clean_files clean_libraries clean_gmp .PHONY: clean_files clean_files : "$(RM)" $(RM_OPTS) $(CLEAN_FILES) +clean_gmp: + "$(RM)" $(RM_OPTS) -r libraries/integer-gmp/gmp/objs + "$(RM)" $(RM_OPTS) -r libraries/integer-gmp/gmp/gmpbuild + .PHONY: clean_libraries clean_libraries: $(patsubst %,clean_libraries/%_dist-install,$(PACKAGES) $(PACKAGES_STAGE2)) clean_libraries: $(patsubst %,clean_libraries/%_dist-boot,$(BOOT_PKGS))