X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=492cc77a03bcb8130d524b254d710f0b4afa17f9;hp=981fec0d8c52026d82e73e0e9a79cbcd4927f3bd;hb=6a05ec5ef5373f61b7f9f5bdc344483417fa801b;hpb=30091f98d69664e7f748639749938dc3a0d5821e diff --git a/Makefile b/Makefile index 981fec0..492cc77 100644 --- a/Makefile +++ b/Makefile @@ -66,10 +66,10 @@ endif SUBDIRS = gmp includes compat utils driver docs rts libraries compiler -# Sanity check that all the core libraries are in the tree, to catch +# Sanity check that all the boot libraries are in the tree, to catch # failure to run darcs-all. check-packages : - @for d in `cat libraries/core-packages`; do \ + @for d in `cat libraries/boot-packages`; do \ if test ! -d libraries/$$d; then \ echo "Looks like you're missing libraries/$$d,"; \ echo "maybe you haven't done './darcs-all get'?"; \ @@ -82,7 +82,13 @@ check-packages : exit 1; \ fi -stage1 : check-packages +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +ifneq "$(WhatGccIsCalled)" "" +GCC_LIB_DEP = stamp.inplace-gcc-lib +endif +endif + +stage1 : $(GCC_LIB_DEP) check-packages $(MAKE) -C utils/mkdependC boot @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \ for i in $(SUBDIRS_BUILD); do \ @@ -133,7 +139,7 @@ all :: stamp.inplace-gcc-lib stamp.inplace-gcc-lib: $(RM) -r compiler/gcc-lib mkdir compiler/gcc-lib - cp $(GccDir)ld.exe compiler/gcc-lib + cp $(LD) compiler/gcc-lib touch $@ clean :: @@ -157,7 +163,6 @@ endif # Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too install :: check-packages - $(INSTALL_DIR) $(bindir) @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \ for i in $(SUBDIRS); do \ echo "------------------------------------------------------------------------"; \ @@ -199,6 +204,11 @@ install :: endif endif +# Install gcc-extra-opts +install :: + $(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_DATA) $(INSTALL_OPTS) extra-gcc-opts $(DESTDIR)$(libdir) + install-docs :: @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \ for i in $(SUBDIRS); do \ @@ -233,8 +243,6 @@ install-docs :: # binary-dist is a GHC addition for binary distributions # -BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2 - binary-dist:: -rm -rf $(BIN_DIST_DIR) -$(RM) $(BIN_DIST_DIR).tar.gz @@ -262,6 +270,7 @@ BIN_DIST_TOP= distrib/Makefile \ ANNOUNCE \ LICENSE \ install-sh \ + extra-gcc-opts.in \ config.guess \ config.sub \ aclocal.m4 @@ -277,7 +286,8 @@ binary-dist:: binary-dist-pre binary-dist-pre:: $(MKDIRHIER) $(BIN_DIST_DIR)/mk echo 'include $$(TOP)/Makefile-vars' > $(BIN_DIST_DIR)/mk/boilerplate.mk - echo 'include $$(TOP)/mk/install.mk' > $(BIN_DIST_DIR)/mk/target.mk + echo 'include $$(TOP)/mk/package.mk' > $(BIN_DIST_DIR)/mk/target.mk + echo 'include $$(TOP)/mk/install.mk' >> $(BIN_DIST_DIR)/mk/target.mk echo 'include $$(TOP)/mk/recurse.mk' >> $(BIN_DIST_DIR)/mk/target.mk echo '' > $(BIN_DIST_DIR)/mk/compat.mk cp mk/package.mk $(BIN_DIST_DIR)/mk/ @@ -384,8 +394,8 @@ binary-dist :: tar-binary-dist .PHONY: tar-binary-dist tar-binary-dist: - ( cd $(BIN_DIST_TOPDIR); tar cf - $(BIN_DIST_NAME) | bzip2 >$(BIN_DIST_TARBALL) ) - ( cd $(BIN_DIST_TOPDIR); bunzip2 -c $(BIN_DIST_TARBALL) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >bin-manifest-$(ProjectVersion) ) + ( cd $(BIN_DIST_TOPDIR_ABS); tar cf - $(BIN_DIST_NAME) | bzip2 >$(BIN_DIST_TARBALL) ) + ( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(BIN_DIST_TARBALL) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >bin-manifest-$(ProjectVersion) ) PUBLISH_FILES = $(BIN_DIST_TARBALL) @@ -405,7 +415,7 @@ endif # Upload the distribution and documentation ifneq "$(PublishLocation)" "" -binary-dist :: publish-binary-dist +publish :: publish-binary-dist endif .PHONY: publish-binary-dist @@ -417,17 +427,23 @@ publish-binary-dist :: done \ done -ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -# On Windows, we cannot use absoluate pathnames to rsync, because they look -# like remote pathnames ("c:/foo/bar"). Also, the docs reside in doc/ -# rather than share/, due to prep-bin-dist-mingw. -publish-binary-dist :: - $(PublishCp) -r $(FPTOOLS_TOP)/$(BIN_DIST_NAME)/doc/html/* $(PublishLocation)/docs +# You need to first make binddisttest, and then run +# make publish 'prefix=$(BIN_DIST_INST_DIR)' +# for this to find the right place. + +# We assume that Windows means Cygwin, as we can't just use docdir +# unchanged or rsync (really SSH?) thinks that c:/foo means /foo on +# the machine c. + +ifeq "$(Windows)" "YES" +PUBLISH_DOCDIR = $(shell cygpath --unix $(docdir)) else -publish-binary-dist :: - $(PublishCp) -r $(BIN_DIST_DIR)/share/html/* $(PublishLocation)/docs +PUBLISH_DOCDIR = $(docdir) endif +publish-binary-dist :: + $(PublishCp) -r $(PUBLISH_DOCDIR)/* $(PublishLocation)/docs + binary-dist:: @echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!" @@ -453,11 +469,11 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME) # # Files to include in source distributions # -SRC_DIST_DIRS += mk docs distrib $(filter-out docs distrib,$(SUBDIRS)) +SRC_DIST_DIRS += mk docs distrib bindisttest $(filter-out docs distrib,$(SUBDIRS)) SRC_DIST_FILES += \ configure.ac config.guess config.sub configure \ aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \ - ghc.spec.in VERSION + ghc.spec.in extra-gcc-opts.in VERSION boot # ----------------------------------------------------------------------------- # Source distributions @@ -490,6 +506,7 @@ dist :: && for i in $(SRC_DIST_DIRS); do mkdir $$i; (cd $$i && lndir $(FPTOOLS_TOP_ABS)/$$i ); done \ && for i in $(SRC_DIST_FILES); do $(LN_S) $(FPTOOLS_TOP_ABS)/$$i .; done \ && $(MAKE) distclean \ + && if test -f $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs; then $(CP) $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs libraries/haskell-src/Language/Haskell/ ; fi \ && $(RM) -rf compiler/stage[123] mk/build.mk \ && $(FIND) $(SRC_DIST_DIRS) \( -name _darcs -o -name SRC -o -name "autom4te*" -o -name "*~" -o -name ".cvsignore" -o -name "\#*" -o -name ".\#*" -o -name "log" -o -name "*-SAVE" -o -name "*.orig" -o -name "*.rej" \) -print | xargs $(RM) -rf \ ) @@ -546,7 +563,7 @@ hc-file-bundle : CLEAN_FILES += hc-files-to-go *-hc.tar.gz DIST_CLEAN_FILES += config.cache config.status mk/config.h mk/stamp-h \ - ghc.spec docs/users_guide/ug-book.xml + ghc.spec docs/users_guide/ug-book.xml extra-gcc-opts # don't clean config.mk: it's needed when cleaning stuff later on LATE_DIST_CLEAN_FILES += mk/config.mk @@ -557,6 +574,10 @@ MAINTAINER_CLEAN_FILES += VERSION extraclean:: $(RM) -rf autom4te.cache +clean distclean :: + $(MAKE) -C bindisttest $@ + if test -d testsuite; then $(MAKE) -C testsuite $@; fi + # ----------------------------------------------------------------------------- # Turn off target.mk's rules for 'all', 'boot' and 'install'.