Reorganisation of the source tree

[ghc-hetmet.git] / ghc / Makefile

diff --git a/ghc/Makefile b/ghc/Makefile
index dbc8017..cacc3f7 100644 (file)
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.24 2004/02/12 02:11:34 mthomas Exp $
+# $Id: Makefile,v 1.30 2005/03/02 14:35:05 simonmar Exp $
 #
 
 TOP=.
@@ -8,6 +8,7 @@ include $(TOP)/mk/boilerplate.mk
 #
 # subdir dependencies:
 #      everything needs utils
+#      utils needs lib
 #      includes/ needs driver (to easily c.pile mkNativeGen.c)
 #      make depend except in {utils,driver} needs includes     
 #      RTS and compiler need includes
@@ -20,34 +21,25 @@ include $(TOP)/mk/boilerplate.mk
 # If we're booting from .hc files, swap the order
 # we descend into subdirs - to boot utils must be before driver.
 #
-
-# First - check whether we should build the docs directory.
-# On Windows, the tools to build docs are not always available.
-
-ifneq "$(SGMLDocWays)" ""
-DOCS_DIR = docs
-else
-DOCS_DIR =
-endif
-
 ifeq "$(BootingFromHc)" "YES"
-SUBDIRS = includes rts $(DOCS_DIR) compiler utils driver
+SUBDIRS = includes rts docs compiler lib utils driver
 else
 ifneq "$(ILXized)" "YES"
-SUBDIRS = includes utils driver $(DOCS_DIR) compiler rts
+SUBDIRS = includes lib utils driver docs compiler rts
 else
 # No RTS for ILX
-SUBDIRS = includes utils driver $(DOCS_DIR) compiler
-endif
+SUBDIRS = includes lib utils driver docs compiler
 endif
-
-ifeq ($(IncludeTestDirsInBuild),YES)
-SUBDIRS += tests
 endif
 
 SRC_DIST_FILES += configure
 
-DIST_CLEAN_FILES += config.cache config.status ghc.spec
+# Clean everything created by configure:
+DIST_CLEAN_FILES += VERSION config.cache config.status ghc.spec \
+       docs/users_guide/ug-book.xml
+
+# don't clean version.mk: it's needed when cleaning stuff later on
+LATE_DIST_CLEAN_FILES += mk/config.mk 
 
 extraclean::
        $(RM) -rf autom4te.cache