Massive patch for the first months work adding System FC to GHC #35

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 1a48e37..736aa53 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -59,14 +59,25 @@ include $(TOP)/mk/boilerplate.mk
 
 # We can't 'make boot' in libraries until stage1 is built
 ifeq "$(BootingFromHc)" "YES"
-SUBDIRS_NOLIB = includes rts docs compiler compat utils driver
+SUBDIRS_NOLIB = includes rts compat compiler docs utils driver
 else
 SUBDIRS_NOLIB = includes compat utils driver docs compiler rts
 endif
 
 SUBDIRS = $(SUBDIRS_NOLIB) libraries
 
-stage1 :
+# Sanity check that all the core libraries are in the tree, to catch
+# failure to run darcs-all.
+check-packages :
+       @for d in `cat libraries/core-packages`; do \
+         if test ! -d libraries/$$d; then \
+            echo "Looks like you're missing libraries/$$d,"; \
+            echo "maybe you haven't done 'sh darcs-all get'?"; \
+            exit 1; \
+         fi \
+       done
+
+stage1 : 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_NOLIB); do \
@@ -88,11 +99,11 @@ stage1 :
        @$(MAKE) -C libraries boot
        @$(MAKE) -C libraries all
 
-stage2 :
+stage2 : check-packages
        $(MAKE) -C compiler boot stage=2
        $(MAKE) -C compiler stage=2
 
-stage3 :
+stage3 : check-packages
        $(MAKE) -C compiler boot stage=3
        $(MAKE) -C compiler stage=3
 
@@ -118,7 +129,7 @@ INSTALL_STAGE =
 endif
 
 # Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too
-install ::
+install :: check-packages
        @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 "------------------------------------------------------------------------"; \
@@ -147,6 +158,8 @@ install ::
        -mkdir $(prefix)/include/mingw
        -cp -rp $(GccDir)../include/* $(prefix)/include/mingw
        -cp -rp $(GccDir)../lib/gcc-lib/mingw32/$(GccVersion)/* $(prefix)/gcc-lib
+       -cp -rp $(GccDir)../lib/gcc/mingw32/$(GccVersion)/* $(prefix)/gcc-lib
+       -cp -rp $(GccDir)../libexec/gcc/mingw32/$(GccVersion)/* $(prefix)/gcc-lib
        -cp $(GccDir)../lib/*.* $(prefix)/gcc-lib
        -cp $(GccDir)gcc.exe $(prefix)
        -cp $(GccDir)as.exe $(prefix)/gcc-lib
@@ -235,7 +248,6 @@ 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 $(BinDistDirs); do                     \
          if test -d "$$i"; then                         \
           echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM); \
@@ -270,7 +282,7 @@ binary-dist::
        done;
        @echo "Configuring the Makefile for this project..."
        touch $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-       echo "package = $(ProjectNameShort)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "package = ghc" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        echo "version = $(ProjectVersion)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        echo "PACKAGE_SH_SCRIPTS = $(BinDistShScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        echo "PACKAGE_PRL_SCRIPTS = $(BinDistPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
@@ -310,7 +322,7 @@ endif # BINDIST_DOC_WAYS
 
 binary-dist ::
 ifneq "$(DIR_DOCBOOK_XSL)" ""
-       @for i in $(BIN_DIST_DIRS); do                          \
+       @for i in $(BinDistDirs); do                            \
          if test -d "$$i"; then                                \
            $(MAKE) -C $$i $(MFLAGS) $(BINDIST_DOC_WAYS);       \
            echo $(MAKE) -C $$i $(MFLAGS) install-docs XMLDocWays="$(BINDIST_DOC_WAYS)" \
@@ -397,6 +409,7 @@ binary-dist::
 #
 # Directory in which we're going to build the src dist
 #
+SRC_DIST_NAME=ghc-$(ProjectVersion)
 SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 
 #
@@ -405,14 +418,12 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 SRC_DIST_DIRS += docs distrib $(filter-out docs distrib,$(SUBDIRS))
 SRC_DIST_FILES += \
        configure.ac config.guess config.sub configure \
-       aclocal.m4 README Makefile install-sh \
-       mk/bootstrap.mk \
+       aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
+       ghc.spec.in 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/fix_install_names.sh
 
-dist dist-manifest dist-package :: project-check
-
 # clean the tree first, leaving certain extra files in place (eg. configure)
 dist :: distclean
 
@@ -446,30 +457,30 @@ dist-package-zip ::
 # -----------------------------------------------------------------------------
 # HC file bundles
 
-hc-file-bundle : project-check
-       $(RM) -r $(ProjectNameShort)-$(ProjectVersion)
-       $(LN_S) . $(ProjectNameShort)-$(ProjectVersion)
-       $(FIND) $(ProjectNameShort)-$(ProjectVersion)/compiler \
-            $(ProjectNameShort)-$(ProjectVersion)/utils \
-            $(ProjectNameShort)-$(ProjectVersion)/compat \
-            $(ProjectNameShort)-$(ProjectVersion)/libraries -follow \
+hc-file-bundle :
+       $(RM) -r ghc-$(ProjectVersion)
+       $(LN_S) . ghc-$(ProjectVersion)
+       $(FIND) ghc-$(ProjectVersion)/compiler \
+            ghc-$(ProjectVersion)/utils \
+            ghc-$(ProjectVersion)/compat \
+            ghc-$(ProjectVersion)/libraries -follow \
          \( -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" \) -print > hc-files-to-go
-       for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/compiler $(ProjectNameShort)-$(ProjectVersion)/utils $(ProjectNameShort)-$(ProjectVersion)/libraries -name "*.hsc" -follow -print` ""; do \
+       for f in `$(FIND) ghc-$(ProjectVersion)/compiler ghc-$(ProjectVersion)/utils ghc-$(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;
-       for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/compiler $(ProjectNameShort)-$(ProjectVersion)/rts -name "*.cmm" -follow -print` ""; do \
+       for f in `$(FIND) ghc-$(ProjectVersion)/compiler ghc-$(ProjectVersion)/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)/compiler/parser/Parser.hs >> hc-files-to-go
-       echo $(ProjectNameShort)-$(ProjectVersion)/compiler/parser/ParserCore.hs >> hc-files-to-go
-       echo $(ProjectNameShort)-$(ProjectVersion)/compiler/main/ParsePkgConf.hs >> hc-files-to-go
-       echo $(ProjectNameShort)-$(ProjectVersion)/libraries/haskell-src/Language/Haskell/Parser.hs >> hc-files-to-go
-       tar czf $(ProjectNameShort)-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go`
+       echo ghc-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> hc-files-to-go
+       echo ghc-$(ProjectVersion)/compiler/parser/Parser.hs >> hc-files-to-go
+       echo ghc-$(ProjectVersion)/compiler/parser/ParserCore.hs >> hc-files-to-go
+       echo ghc-$(ProjectVersion)/compiler/main/ParsePkgConf.hs >> hc-files-to-go
+       echo ghc-$(ProjectVersion)/libraries/haskell-src/Language/Haskell/Parser.hs >> hc-files-to-go
+       tar czf ghc-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go`
 
 # -----------------------------------------------------------------------------
 # Cleaning