X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=88e14df03f382123a600a18eb91fa1987a03c4a1;hp=4eb83e76faeb6af9e2c84728db111eba673530a3;hb=ac10f8408520a30e8437496d320b8b86afda2e8f;hpb=0689f025fa6838d20aa417d81a6e93938fb13971 diff --git a/Makefile b/Makefile index 4eb83e7..88e14df 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,8 @@ ifneq "$(Project)" "" ProjectDirectory=$(Project) endif endif - include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/config.mk + -include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/config.mk + -include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/version.mk endif # ----------------------------------------------------------------------------- @@ -46,7 +47,7 @@ project-check : # ----------------------------------------------------------------------------- # Targets: all, stage1, stage2, stage3 -DIST_CLEAN_FILES += config.cache config.status +DIST_CLEAN_FILES += config.cache config.status mk/config.h mk/stamp-h extraclean:: $(RM) -rf autom4te.cache @@ -56,14 +57,14 @@ extraclean:: # make sure it gets built early on. # ifeq "$(HAPPY)" "$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace" -build : $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace +build :: $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace : glafp-utils $(MAKE) -C happy boot all endif # Build all projects that we know about -build : +build :: @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \ for i in $(SUBDIRS); do \ if [ -d $$i ]; then \ @@ -76,6 +77,8 @@ build : ifeq "$(findstring ghc, $(SUBDIRS))" "ghc" +.PHONY: stage1 stage2 stage3 bootstrap bootstrap2 bootstrap3 + stage1 : build stage2 : @@ -87,8 +90,12 @@ stage3 : $(MAKE) -C ghc/compiler stage=3 bootstrap : bootstrap2 -bootstrap2 : stage1 stage2 -bootstrap3 : stage1 stage2 stage3 + +bootstrap2 : stage1 + $(MAKE) stage2 + +bootstrap3 : bootstrap2 + $(MAKE) stage3 all :: bootstrap @@ -121,6 +128,28 @@ install :: fi; \ done +# If installing on Windows with MinGW32, copy the gcc compiler, headers and libs +# and the perl interpreter and dll into the GHC prefix directory. +# Gcc and Perl source locations derived from configuration data. +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +ifneq "$(WhatGccIsCalled)" "" +install :: + -mkdir $(prefix)/gcc-lib + -mkdir $(prefix)/include + -mkdir $(prefix)/include/mingw + -cp -rp $(GccDir)../include/* $(prefix)/include/mingw + -cp -rp $(GccDir)../lib/gcc-lib/mingw32/$(GccVersion)/* $(prefix)/gcc-lib + -cp $(GccDir)../lib/*.* $(prefix)/gcc-lib + -cp $(GccDir)gcc.exe $(prefix) + -cp $(GccDir)as.exe $(prefix)/gcc-lib + -cp $(GccDir)ld.exe $(prefix)/gcc-lib + -cp $(GccDir)dllwrap.exe $(prefix)/gcc-lib + -cp $(GccDir)dlltool.exe $(prefix)/gcc-lib + -cp $(GhcDir)../perl.exe $(prefix) + -cp $(GhcDir)../perl56.dll $(prefix) +endif +endif + install-docs :: @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \ for i in $(filter-out $(ProjectsDontInstall), $(SUBDIRS)); do \ @@ -182,6 +211,10 @@ BIN_DIST_TOP= distrib/Makefile-bin.in \ config.sub \ aclocal.m4 +ifeq "$(darwin_TARGET_OS)" "1" +BIN_DIST_TOP+=mk/fix_install_names.sh +endif + # # binary-dist creates a binary bundle, set BIN_DIST_NAME # to package name and do `make binary-dist Project=' @@ -238,7 +271,9 @@ binary-dist:: echo "PACKAGE_SH_SCRIPTS = $($(Project)BinDistShScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in echo "PACKAGE_PRL_SCRIPTS = $($(Project)BinDistPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in echo "PACKAGE_LIB_PRL_SCRIPTS = $($(Project)BinDistLibPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in + echo "PACKAGE_LIB_SPLICED_FILES = $($(Project)BinDistLibSplicedFiles)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in echo "PACKAGE_BINS = $($(Project)BinDistBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in + echo "PACKAGE_OPT_BINS = $($(Project)BinDistOptBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in echo "PACKAGE_LINKS = $($(Project)BinDistLinks)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in cat $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in @echo "Generating a shippable configure script.." @@ -254,24 +289,42 @@ binary-dist:: fi # # binary dist'ing the documentation. -# Which documentation to build/install is hardcoded below. -# +# The default documentation to build/install is given below; overrideable +# via build.mk or the 'make' command-line. + +ifndef BINDIST_DOC_WAYS + +ifneq "$(XSLTPROC)" "" +BINDIST_DOC_WAYS = html +ifneq "$(FOP)" "" +BINDIST_DOC_WAYS += ps pdf +else +ifneq "$(PDFXMLTEX)" "" +BINDIST_DOC_WAYS += pdf +endif +ifneq "$(XMLTEX)" "" +ifneq "$(DVIPS)" "" +BINDIST_DOC_WAYS += ps +endif # DVIPS +endif # XMLTEX +endif # FOP +endif # XSLTPROC -BINDIST_DOC_WAYS = html ps -# BINDIST_DOC_WAYS = +endif # BINDIST_DOC_WAYS binary-dist :: +ifneq "$(DIR_DOCBOOK_XSL)" "" @for i in $(BIN_DIST_DIRS); do \ if test -d "$$i"; then \ $(MAKE) -C $$i $(MFLAGS) $(BINDIST_DOC_WAYS); \ - echo $(MAKE) -C $$i $(MFLAGS) install-docs SGMLDocWays="$(BINDIST_DOC_WAYS)" \ + echo $(MAKE) -C $$i $(MFLAGS) install-docs XMLDocWays="$(BINDIST_DOC_WAYS)" \ prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \ libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \ libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \ datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \ - $(MAKE) -C $$i $(MFLAGS) install-docs SGMLDocWays="$(BINDIST_DOC_WAYS)" \ + $(MAKE) -C $$i $(MFLAGS) install-docs XMLDocWays="$(BINDIST_DOC_WAYS)" \ prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \ @@ -280,6 +333,7 @@ binary-dist :: datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \ fi \ done +endif # Rename scripts to $i.prl and $i.sh where necessary. # ToDo: do this in a cleaner way... @@ -303,8 +357,10 @@ endif ifneq "$($(Project)BinDistShScripts)" "" binary-dist:: @for i in $($(Project)BinDistShScripts); do \ - echo "Renaming $$i to $$i.sh"; \ - $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.sh; \ + if test -x $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i ; then \ + echo "Renaming $$i to $$i.sh"; \ + $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.sh; \ + fi \ done endif @@ -350,13 +406,14 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME) # # Files to include in source distributions # -SRC_DIST_DIRS += docs distrib $(SUBDIRS) +SRC_DIST_DIRS += docs distrib $(filter-out docs distrib,$(SUBDIRS)) SRC_DIST_FILES += \ configure.ac config.guess config.sub configure \ - aclocal.m4 README Makefile Makefile.config install-sh \ + aclocal.m4 README Makefile install-sh \ mk/bootstrap.mk \ mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \ - mk/paths.mk mk/package.mk mk/suffix.mk mk/target.mk + mk/paths.mk mk/package.mk mk/suffix.mk mk/target.mk \ + mk/fptools.css mk/fix_install_names.sh dist dist-manifest dist-package :: project-check @@ -380,8 +437,11 @@ dist-package :: dist-package-tar-gz SRC_DIST_PATHS = $(patsubst %, $(SRC_DIST_NAME)/%, $(SRC_DIST_FILES) $(SRC_DIST_DIRS)) +dist-package-tar-bz2 :: + BZIP2=-9 $(TAR) chjf $(SRC_DIST_NAME)-src.tar.bz2 $(SRC_DIST_NAME) || $(RM) $(SRC_DIST_NAME)-src.tar.bz2 + dist-package-tar-gz :: - $(TAR) chzf $(SRC_DIST_NAME)-src.tar.gz $(SRC_DIST_NAME) + $(TAR) chzf $(SRC_DIST_NAME)-src.tar.gz $(SRC_DIST_NAME) || $(RM) $(SRC_DIST_NAME)-src.tar.gz dist-package-zip :: cd ..; $(LN_S) $(FPTOOLS_TOP_ABS) $(SRC_DIST_NAME) && \ @@ -395,6 +455,7 @@ hc-file-bundle : project-check $(LN_S) . $(ProjectNameShort)-$(ProjectVersion) $(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \ $(ProjectNameShort)-$(ProjectVersion)/ghc/utils \ + $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \ $(ProjectNameShort)-$(ProjectVersion)/libraries -follow \ \( -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" \) -print > hc-files-to-go for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler $(ProjectNameShort)-$(ProjectVersion)/ghc/utils $(ProjectNameShort)-$(ProjectVersion)/libraries -name "*.hsc" -follow -print` ""; do \ @@ -402,7 +463,11 @@ hc-file-bundle : project-check echo `echo "$$f" | sed 's/hsc$$/hs/g' ` >> hc-files-to-go ; \ fi; \ done; - echo $(ProjectNameShort)-$(ProjectVersion)/ghc/rts/AutoApply.hc >> hc-files-to-go + for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler $(ProjectNameShort)-$(ProjectVersion)/ghc/rts -name "*.cmm" -follow -print` ""; do \ + if test "x$$f" != "x"; then \ + echo `echo "$$f" | sed 's/cmm$$/hc/g' ` >> hc-files-to-go ; \ + fi; \ + done; echo $(ProjectNameShort)-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> hc-files-to-go echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/Parser.hs >> hc-files-to-go echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/ParserCore.hs >> hc-files-to-go