[project @ 2003-08-27 15:18:29 by panne]

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 307168e..1ec0796 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ endif
 
 ifneq "$(Project)" ""
    ifeq "$(Project)" "GreenCard"
-       ProjectDirectory=green-card
+       ProjectDirectory=greencard
    else
        ifeq "$(Project)" "HaskellDirect"
                ProjectDirectory=hdirect
@@ -167,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 \
@@ -239,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 \
@@ -349,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
@@ -392,16 +392,15 @@ hc-file-bundle : project-check
        $(LN_S) . $(ProjectNameShort)-$(ProjectVersion)
        $(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
             $(ProjectNameShort)-$(ProjectVersion)/ghc/utils \
-            $(ProjectNameShort)-$(ProjectVersion)/libraries \
-            $(ProjectNameShort)-$(ProjectVersion)/hslibs \
+            $(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 $(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