X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=1ec0796212f06d487256381a01fc590159b1b603;hp=376351619646da6cdf955160d927cc67236f80b9;hb=cab3c5cb1a0038412472172cb0b25bc81dfdde8f;hpb=474955abf3fe4d26171b3ba5ecdbc1784c80cf3a diff --git a/Makefile b/Makefile index 3763516..1ec0796 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,16 @@ SUBDIRS = $(filter $(ProjectsToBuild), $(ProjectsThatExist)) endif ifneq "$(Project)" "" - include $(shell echo $(Project) | tr A-Z a-z)/mk/config.mk + ifeq "$(Project)" "GreenCard" + ProjectDirectory=greencard + else + ifeq "$(Project)" "HaskellDirect" + ProjectDirectory=hdirect + else + ProjectDirectory=$(Project) + endif + endif + include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/config.mk endif # ----------------------------------------------------------------------------- @@ -35,6 +44,90 @@ project-check : fi # ----------------------------------------------------------------------------- +# Targets: all, stage1, stage2, stage3 + +DIST_CLEAN_FILES += config.cache config.status + +# +# If you've ended up using an in-place version of Happy, +# make sure it gets built early on. +# +ifeq "$(HAPPY)" "$(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 : + @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 \ + $(MAKE) -C $$i boot; \ + if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \ + $(MAKE) -C $$i all; \ + if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \ + fi; \ + done + +ifeq "$(findstring ghc, $(SUBDIRS))" "ghc" + +stage1 : build + +stage2 : + $(MAKE) -C ghc/compiler boot stage=2 + $(MAKE) -C ghc/compiler stage=2 + +stage3 : + $(MAKE) -C ghc/compiler boot stage=3 + $(MAKE) -C ghc/compiler stage=3 + +bootstrap : bootstrap2 +bootstrap2 : stage1 stage2 +bootstrap3 : stage1 stage2 stage3 + +all :: bootstrap + +# We want to install the stage 2 bootstrapped compiler by default, but we let +# the user override this by saying 'make install stage=1', for example. +ifeq "$(stage)" "" +INSTALL_STAGE = stage=2 +else +INSTALL_STAGE = +endif + +else # Not building GHC + +all :: build + +INSTALL_STAGE = + +endif + +boot :: + @echo "Please use \`make all' only from the top-level, or \`make boot' followed" + @echo "by \`make all' in an individual project subdirectory (ghc, hslibs etc.)." + +install :: + @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 \ + if [ -d $$i ]; then \ + $(MAKE) -C $$i $(INSTALL_STAGE) install; \ + if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \ + fi; \ + done + +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 \ + if [ -d $$i ]; then \ + $(MAKE) -C $$i $(INSTALL_STAGE) install-docs; \ + if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \ + fi; \ + done + +# ----------------------------------------------------------------------------- # Making a binary distribution # # To make a particular binary distribution: @@ -74,7 +167,7 @@ BIN_DIST_DIRS=$($(Project)BinDistDirs) binary-dist:: binary-dist-pre BIN_DIST_TOP= distrib/Makefile-bin.in \ - distrib/configure-bin.in \ + distrib/configure-bin.ac \ distrib/INSTALL \ $(BIN_DIST_MAIN_DIR)/ANNOUNCE \ $(BIN_DIST_MAIN_DIR)/VERSION \ @@ -102,6 +195,7 @@ ifeq "$(BIN_DIST)" "" endif -rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) -$(RM) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz + -echo "BIN_DIST_DIRS = $(BIN_DIST_DIRS)" @for i in $(BIN_DIST_DIRS); do \ if test -d "$$i"; then \ echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM); \ @@ -110,14 +204,14 @@ endif $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM); \ echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \ $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \ - echo $(MAKE) -C $$i $(MFLAGS) install \ + echo $(MAKE) -C $$i $(MFLAGS) $(INSTALL_STAGE) install \ 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 \ + $(MAKE) -C $$i $(MFLAGS) $(INSTALL_STAGE) install \ prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \ @@ -145,7 +239,7 @@ binary-dist:: 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.." - $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.in + $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.ac $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.ac ( cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); autoconf ) if test -x $(BIN_DIST_MAIN_DIR)/mk/post-install-script ; then \ cp $(BIN_DIST_MAIN_DIR)/mk/post-install-script \ @@ -161,19 +255,20 @@ binary-dist:: # BINDIST_DOC_WAYS = html ps +# BINDIST_DOC_WAYS = binary-dist :: @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="html ps" \ + echo $(MAKE) -C $$i $(MFLAGS) install-docs SGMLDocWays="$(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="html ps" \ + $(MAKE) -C $$i $(MFLAGS) install-docs SGMLDocWays="$(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) \ @@ -254,8 +349,8 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME) # SRC_DIST_DIRS += docs distrib $(SUBDIRS) SRC_DIST_FILES += \ - configure.in config.guess config.sub configure \ - aclocal.m4 acconfig.h README Makefile Makefile.config install-sh \ + configure.ac config.guess config.sub configure \ + aclocal.m4 README Makefile Makefile.config 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 @@ -270,8 +365,8 @@ dist :: -$(RM) $(SRC_DIST_NAME).tar.gz mkdir $(SRC_DIST_DIR) mkdir $(SRC_DIST_DIR)/mk - ( cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) -type d \( -name CVS -prune -o -name SRC -prune -o -print \) | sed -e 's!.*!mkdir "$(SRC_DIST_DIR)/&"!' | sh ) - ( cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) $(SRC_DIST_FILES) -name CVS -prune -o -name SRC -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -name "\#*" -prune -o -name ".\#*" -prune -o -name "log" -prune -o -name "*-SAVE" -prune -o -name "*.orig" -prune -o -name "*.rej" -prune -o ! -type d -print | sed -e 's!.*!$(LN_S) "$(FPTOOLS_TOP_ABS)/&" "$(SRC_DIST_DIR)/&"!' | sh ) + $(FIND) $(SRC_DIST_DIRS) -type d \( -name CVS -prune -o -name SRC -prune -o -name "autom4te*" -prune -o -print \) | sed -e 's!.*!mkdir "$(SRC_DIST_DIR)/&"!' | sh + $(FIND) $(SRC_DIST_DIRS) $(SRC_DIST_FILES) -name CVS -prune -o -name SRC -prune -o -name "autom4te*" -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -name "\#*" -prune -o -name ".\#*" -prune -o -name "log" -prune -o -name "*-SAVE" -prune -o -name "*.orig" -prune -o -name "*.rej" -prune -o ! -type d -print | sed -e 's!.*!$(LN_S) "$(FPTOOLS_TOP_ABS)/&" "$(SRC_DIST_DIR)/&"!' | sh # Automatic generation of a MANIFEST file for a source distribution # tree that is ready to go. @@ -296,17 +391,16 @@ hc-file-bundle : project-check $(RM) -r $(ProjectNameShort)-$(ProjectVersion) $(LN_S) . $(ProjectNameShort)-$(ProjectVersion) $(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \ - $(ProjectNameShort)-$(ProjectVersion)/ghc/driver \ - $(ProjectNameShort)-$(ProjectVersion)/libraries \ - $(ProjectNameShort)-$(ProjectVersion)/hslibs \ + $(ProjectNameShort)-$(ProjectVersion)/ghc/utils \ + $(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/driver $(ProjectNameShort)-$(ProjectVersion)/libraries $(ProjectNameShort)-$(ProjectVersion)/hslibs -name "*.hsc" -print` ""; do \ + for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler $(ProjectNameShort)-$(ProjectVersion)/ghc/utils $(ProjectNameShort)-$(ProjectVersion)/libraries -name "*.hsc" -follow -print` ""; do \ if test "x$$f" != "x" && test -e `echo "$$f" | sed 's/hsc$$/hs/g'`; then \ 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 echo $(ProjectNameShort)-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> hc-files-to-go - echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/*.hs-incl >> 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 echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/main/ParsePkgConf.hs >> hc-files-to-go @@ -317,52 +411,6 @@ CLEAN_FILES += hc-files-to-go *-hc.tar.gz # ----------------------------------------------------------------------------- -DIST_CLEAN_FILES += config.cache config.status - -# -# If you've ended up using an in-place version of Happy, -# make sure it gets built early on. -# -ifeq "$(HAPPY)" "$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace" -all :: $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace - -$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace : glafp-utils - $(MAKE) -C happy boot all -endif - -all :: - @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 \ - $(MAKE) -C $$i boot; \ - if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \ - $(MAKE) -C $$i all; \ - if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \ - fi; \ - done - -boot :: - @echo "Please use \`make all' only from the top-level, or \`make boot' followed" - @echo "by \`make all' in an individual project subdirectory (ghc, hslibs etc.)." - -install :: - @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 \ - if [ -d $$i ]; then \ - $(MAKE) -C $$i install; \ - if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \ - fi; \ - done - -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 \ - if [ -d $$i ]; then \ - $(MAKE) -C $$i install-docs; \ - if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \ - fi; \ - done - # Turn off target.mk's rules for 'all', 'boot' and 'install'. NO_BOOT_TARGET=YES NO_ALL_TARGET=YES