X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=de18a692365a4a4437a52b8dbe72adb67d2d207a;hb=d4f9480c7e7bf8167a97ff964f9d85400398c5c4;hp=820c36cd900b40271eb66948c54ce5b0d0fb9d0a;hpb=9c5b7a1e68fe6b30b64f481be9a11e3db3247c6a;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 820c36c..de18a69 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -13,7 +13,6 @@
 # ToDo List.
 #
 #   * finish installation
-#     * create doc index and contents
 #     * Windows: should we have ghc-pkg-<version>?
 #     * should we be stripping things?
 #     * install libgmp.a, gmp.h
@@ -141,6 +140,9 @@ endif
 include rules/all-target.mk
 include rules/clean-target.mk
 
+# Helper macro
+include rules/mkdep.mk
+
 # -----------------------------------------------------------------------------
 # The inplace tree
 
@@ -590,6 +592,15 @@ 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
+
+ifeq "$(CHECK_PACKAGES)" "YES"
+all: check_packages
+endif
+
 # -----------------------------------------------------------------------------
 # Bootstrapping libraries
 
@@ -709,13 +720,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
@@ -732,6 +743,10 @@ install_docs: $(INSTALL_HEADERS)
 		$(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`; \
@@ -749,8 +764,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),\
@@ -758,17 +775,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)' '$(libdir)' '$(docdir)/html/libraries' &&) true
 	"$(GHC_CABAL_INPLACE)" install \
 	 	 $(INSTALLED_GHC_PKG_REAL) \
 		 $(INSTALLED_PACKAGE_CONF) \
 		 compiler stage2 \
-		 '$(DESTDIR)' '$(prefix)' '$(libdir)' '$(docdir)/libraries'
+		 '$(DESTDIR)' '$(prefix)' '$(libdir)' '$(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 \
@@ -786,7 +804,12 @@ $(eval $(call bindist,.,\
     $(INSTALL_LIBEXEC_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))) \
 	mk/fix_install_names.sh \
@@ -945,13 +968,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))