[project @ 2004-03-11 09:53:45 by simonmar]

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 44ac9ac..99e5988 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
@@ -48,19 +48,22 @@ project-check :
 
 DIST_CLEAN_FILES += config.cache config.status
 
+extraclean::
+       $(RM) -rf autom4te.cache
+
 #
 # 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
+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 :
+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 \
@@ -191,7 +194,7 @@ BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
 
 binary-dist-pre::
 ifeq "$(BIN_DIST)" ""
-       echo "WARNING: To run the binary-dist target, you need to set BIN_DIST=1 in your build.mk" && exit 1
+       @echo "WARNING: To run the binary-dist target, you need to set BIN_DIST=1 in your build.mk" && exit 1
 endif
        -rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)
        -$(RM) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz
@@ -350,7 +353,7 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 SRC_DIST_DIRS += docs distrib $(SUBDIRS)
 SRC_DIST_FILES += \
        configure.ac config.guess config.sub configure \
-       aclocal.m4 acconfig.h README Makefile Makefile.config install-sh \
+       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