X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=a8350fa24d3c2096bd7269d15288706b6c8b87b5;hb=7aede9b10573d1c652bf6f18e9fcaf65c2b6f656;hp=16fcb5dfb3d02d23299611eaa3808363870a07ab;hpb=c7333e5dcef5345b1ac1a7e382aeda8bdbfa9c16;p=ghc-hetmet.git diff --git a/Makefile b/Makefile index 16fcb5d..a8350fa 100644 --- a/Makefile +++ b/Makefile @@ -47,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 @@ -77,6 +77,8 @@ build :: ifeq "$(findstring ghc, $(SUBDIRS))" "ghc" +.PHONY: stage1 stage2 stage3 bootstrap bootstrap2 bootstrap3 + stage1 : build stage2 : @@ -88,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 @@ -205,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=' @@ -261,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.." @@ -277,14 +289,31 @@ 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. -BINDIST_DOC_WAYS = html ps -# BINDIST_DOC_WAYS = +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 + +endif # BINDIST_DOC_WAYS binary-dist :: -ifneq "$(DOCBOOK_CATALOG)" "" +ifneq "$(DIR_DOCBOOK_XSL)" "" @for i in $(BIN_DIST_DIRS); do \ if test -d "$$i"; then \ $(MAKE) -C $$i $(MFLAGS) $(BINDIST_DOC_WAYS); \ @@ -384,7 +413,7 @@ SRC_DIST_FILES += \ 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/fptools.css + mk/fptools.css mk/fix_install_names.sh dist dist-manifest dist-package :: project-check @@ -396,8 +425,8 @@ dist :: -$(RM) $(SRC_DIST_NAME).tar.gz mkdir $(SRC_DIST_DIR) mkdir $(SRC_DIST_DIR)/mk - $(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 + $(FIND) $(SRC_DIST_DIRS) -type d \( -name _darcs -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 _darcs -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. @@ -426,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 \ @@ -433,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