X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=a60380a03b078d22e3df755b75cc9d387aac17db;hb=b3bd828c358cbd79887dbd873357e265d8d6060a;hp=c1a71ae5a4c8b6ee9943e3b00cb4d1e0586f1848;hpb=51984e25deeba8a8abbab00d89cca51f3fd051b0;p=ghc-hetmet.git diff --git a/ghc.mk b/ghc.mk index c1a71ae..a60380a 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) # @@ -144,6 +140,9 @@ endif include rules/all-target.mk include rules/clean-target.mk +# Helper macro +include rules/mkdep.mk + # ----------------------------------------------------------------------------- # The inplace tree @@ -297,8 +296,12 @@ define addPackage # args: $1 = package, $2 = condition endef $(eval $(call addPackage,ghc-prim)) +ifeq "$(CLEANING)" "YES" $(eval $(call addPackage,integer-gmp)) -$(eval $(call addPackage,integer)) +$(eval $(call addPackage,integer-simple)) +else +$(eval $(call addPackage,$(INTEGER_LIBRARY))) +endif $(eval $(call addPackage,base)) $(eval $(call addPackage,filepath)) $(eval $(call addPackage,array)) @@ -505,8 +508,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) \ @@ -586,6 +592,11 @@ libraries/base3-compat_dist-install_HC_OPTS += -XPackageImports .PHONY: stage1_libs stage1_libs : $(ALL_STAGE1_LIBS) +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 + # ----------------------------------------------------------------------------- # Bootstrapping libraries @@ -674,7 +685,7 @@ 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_bins: $(INSTALL_BINS) $(INSTALL_DIR) $(DESTDIR)$(bindir) @@ -705,13 +716,13 @@ install_libs: $(INSTALL_LIBS) done install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS) - "$(MKDIRHIER)" $(DESTDIR)$(libexecdir) + $(INSTALL_DIR) $(DESTDIR)$(libexecdir) for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(libexecdir); \ done install_libexecs: $(INSTALL_LIBEXECS) - "$(MKDIRHIER)" $(DESTDIR)$(libexecdir) + $(INSTALL_DIR) $(DESTDIR)$(libexecdir) for i in $(INSTALL_LIBEXECS); do \ $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(libexecdir); \ done @@ -722,6 +733,20 @@ install_headers: $(INSTALL_HEADERS) $(INSTALL_HEADER) $(INSTALL_OPTS) $$i $(DESTDIR)$(headerdir); \ done +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; \ + for i in $(INSTALL_LIBRARY_DOCS); do \ + $(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir)/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)$(libdir)/package.conf # Install packages in the right order, so that ghc-pkg doesn't complain. @@ -734,8 +759,10 @@ 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)$(libdir) + "$(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),\ @@ -770,19 +797,31 @@ $(eval $(call bindist,.,\ $(INSTALL_LIBEXECS) \ $(INSTALL_LIBEXEC_SCRIPTS) \ $(INSTALL_BINS) \ + $(INSTALL_DOCS) \ + $(INSTALL_LIBRARY_DOCS) \ + $(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \ + $(wildcard libraries/*/dist-install/doc/) \ $(filter-out extra-gcc-opts,$(INSTALL_LIBS)) \ $(filter-out %/project.mk,$(filter-out mk/config.mk,$(MAKEFILE_LIST))) \ mk/fix_install_names.sh \ mk/project.mk \ + 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) @@ -807,6 +846,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 @@ -916,13 +959,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))