[project @ 2002-03-25 15:56:00 by sof]

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index ed00829..f0714de 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,6 @@ BIN_DIST_TOP= distrib/Makefile-bin.in \
              distrib/INSTALL \
              $(BIN_DIST_MAIN_DIR)/ANNOUNCE \
              $(BIN_DIST_MAIN_DIR)/VERSION \
-             $(BIN_DIST_MAIN_DIR)/RELEASE \
              $(BIN_DIST_MAIN_DIR)/LICENSE \
              $(BIN_DIST_MAIN_DIR)/README \
              glafp-utils/mkdirhier/mkdirhier \
@@ -161,7 +160,6 @@ binary-dist::
 BINDIST_DOCS = $($(Project)BinDistDocs)
 BINDIST_DOCS_WAYS = html ps
 
-ifeq "$(HOSTPLATFORM)" "i386-unknown-linux"
 binary-dist ::
        @for way in $(BINDIST_DOCS_WAYS); do \
           $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way; \
@@ -180,7 +178,6 @@ binary-dist ::
           done; \
        done
        @rm -f .doclog
-endif
 
 # Rename scripts to $i.prl and $i.sh where necessary.
 # ToDo: do this in a cleaner way...
@@ -297,12 +294,17 @@ hc-file-bundle : project-check
             $(ProjectNameShort)-$(ProjectVersion)/ghc/driver \
             $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
             $(ProjectNameShort)-$(ProjectVersion)/hslibs \
-         -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" > hc-files-to-go
+         \( -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" \) -print > hc-files-to-go
        find $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
             $(ProjectNameShort)-$(ProjectVersion)/ghc/driver \
             $(ProjectNameShort)-$(ProjectVersion)/ghc/lib \
             $(ProjectNameShort)-$(ProjectVersion)/hslibs \
-         -name "*.hsc" | sed 's/hsc$$/hs/g' >> hc-files-to-go
+         -name "*.hsc" -print | sed 's/hsc$$/hs/g' >> 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/main/ParsePkgConf.hs >> hc-files-to-go
+       echo $(ProjectNameShort)-$(ProjectVersion)/hslibs/hssource/HsParser.hs >> hc-files-to-go
        tar czf $(ProjectNameShort)-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go`
 
 CLEAN_FILES += hc-files-to-go *-hc.tar.gz
@@ -311,6 +313,17 @@ 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
+       cd happy && make 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 \
@@ -333,7 +346,20 @@ install ::
              fi; \
        done
 
-NO_ALL_TARGETS=YES
+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
+NO_INSTALL_TARGET=YES
+
 include $(TOP)/mk/target.mk
 
 # -----------------------------------------------------------------------------