X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=1e66ebfe9e5a46cca5b8be5d8699e53f8e1b1cc1;hb=74cda6e5e3acef102eb5c176e4c6edca7a74198b;hp=26dc314a31c14a4dc337486f832bafbe1972a472;hpb=07c1b41bc0d960b6e2509332f96f72439fe88864;p=ghc-hetmet.git diff --git a/ghc.mk b/ghc.mk index 26dc314..1e66ebf 100644 --- a/ghc.mk +++ b/ghc.mk @@ -83,7 +83,7 @@ # We need second expansion for the way we handle directories, so that # | $$$$(dir $$$$@)/. -# expands to the directoy of a rule that uses a % pattern. +# expands to the directory of a rule that uses a % pattern. .SECONDEXPANSION: default : all @@ -360,9 +360,9 @@ ALL_STAGE1_LIBS += $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_dyn endif BOOT_LIBS = $(foreach lib,$(BOOT_PKGS),$(libraries/$(lib)_dist-boot_v_LIB)) -OTHER_LIBS = libffi/libHSffi$(v_libsuf) libffi/HSffi.o +OTHER_LIBS = libffi/dist-install/build/libHSffi$(v_libsuf) libffi/dist-install/build/HSffi.o ifeq "$(BuildSharedLibs)" "YES" -OTHER_LIBS += libffi/libHSffi$(dyn_libsuf) +OTHER_LIBS += libffi/dist-install/build/libHSffi$(dyn_libsuf) endif # We cannot run ghc-cabal to configure a package until we have @@ -486,12 +486,12 @@ BUILD_DIRS = ifneq "$(BINDIST)" "YES" BUILD_DIRS += \ - $(GHC_MKDEPENDC_DIR) \ $(GHC_MKDIRHIER_DIR) endif BUILD_DIRS += \ docs/users_guide \ + docs/man \ libraries/Cabal/doc \ $(GHC_UNLIT_DIR) \ $(GHC_HP2PS_DIR) @@ -681,8 +681,8 @@ compiler/stage1/package-data.mk : \ # These are necessary because the bootstrapping compiler may not know # about cross-package dependencies: -$(compiler_stage1_depfile) : $(BOOT_LIBS) -$(ghc_stage1_depfile) : $(compiler_stage1_v_LIB) +$(compiler_stage1_depfile_haskell) : $(BOOT_LIBS) +$(ghc_stage1_depfile_haskell) : $(compiler_stage1_v_LIB) # A few careful dependencies between bootstrapping packages. When we # can rely on the stage 0 compiler being able to generate @@ -716,11 +716,18 @@ install : install_mingw install_mingw : $(INPLACE_MINGW) "$(CP)" -Rp $(INPLACE_MINGW) $(prefix) +install : install_perl +.PHONY: install_perl +install_perl : $(INPLACE_PERL) + "$(CP)" -Rp $(INPLACE_PERL) $(prefix) + endif # Windows -libraries/ghc-prim/dist-install/doc/html/ghc-prim/ghc-prim.haddock: \ +ifneq "$(BINDIST)" "YES" +$(ghc-prim_HADDOCK_FILE): \ libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs \ libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs +endif # BINDIST libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs: \ $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) \ @@ -743,9 +750,6 @@ 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 $(ghclibdir) "$(DESTDIR)$(bindir)/$$i" ; \ - fi ; \ done install_libs: $(INSTALL_LIBS) @@ -760,8 +764,7 @@ install_libs: $(INSTALL_LIBS) *.so) \ $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)" ;; \ *.dylib) \ - $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \ - install_name_tool -id "$(DESTDIR)$(ghclibdir)/`basename $$i`" "$(DESTDIR)$(ghclibdir)/`basename $$i`" ;; \ + $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)";; \ *) \ $(INSTALL_DATA) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibdir)"; \ esac; \ @@ -808,7 +811,7 @@ install_headers: $(INSTALL_HEADERS) $(INSTALL_HEADER) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghcheaderdir)"; \ done -install_docs: $(INSTALL_HEADERS) +install_docs: $(INSTALL_DOCS) $(INSTALL_DIR) "$(DESTDIR)$(docdir)" ifneq "$(INSTALL_DOCS)" "" for i in $(INSTALL_DOCS); do \ @@ -818,6 +821,7 @@ endif $(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html" $(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html" ifneq "$(INSTALL_LIBRARY_DOCS)" "" + $(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html/libraries" for i in $(INSTALL_LIBRARY_DOCS); do \ $(INSTALL_DOC) $(INSTALL_OPTS) $$i "$(DESTDIR)$(docdir)/html/libraries/"; \ done @@ -912,14 +916,15 @@ $(eval $(call bindist,.,\ $(INSTALL_TOPDIRS) \ $(INSTALL_TOPDIR_SCRIPTS) \ $(INSTALL_BINS) \ + $(INSTALL_MANPAGES) \ $(INSTALL_DOCS) \ $(INSTALL_LIBRARY_DOCS) \ $(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \ docs/index.html \ + compiler/stage2/doc \ $(wildcard libraries/*/dist-install/doc/) \ $(filter-out extra-gcc-opts,$(INSTALL_LIBS)) \ $(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 \ @@ -942,6 +947,7 @@ unix-binary-dist-prep: 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) + echo "BUILD_MAN = $(BUILD_MAN)" >> $(BIN_DIST_MK) ln -s ../../distrib/configure-bin.ac $(BIN_DIST_PREP_DIR)/configure.ac cd $(BIN_DIST_PREP_DIR) && autoreconf "$(RM)" $(RM_OPTS) $(BIN_DIST_PREP_TAR) @@ -1002,7 +1008,7 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME) # # Files to include in source distributions # -SRC_DIST_DIRS = mk rules docs distrib bindisttest libffi includes utils docs rts compiler ghc driver libraries +SRC_DIST_DIRS = mk rules docs distrib bindisttest libffi includes utils docs rts compiler ghc driver libraries ghc-tarballs SRC_DIST_FILES += \ configure.ac config.guess config.sub configure \ aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \ @@ -1074,6 +1080,15 @@ SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) endif # ----------------------------------------------------------------------------- +# sdisting libraries + +# Use manually, with e.g.: +# make sdist_directory + +sdist_%: + inplace/bin/ghc-cabal sdist libraries/$* dist-install + +# ----------------------------------------------------------------------------- # Cleaning .PHONY: clean