X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=ad9476ad721b1f936117e70979b94f14cf1a8c3a;hb=9bb6b6d0fbca6c82040027fab9859c9fcbc1ef7e;hp=3876e1b6708c61aab528b73aae26442e382ab79e;hpb=1fb1ab5d53a09607e7f6d2450806760688396387;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index 3876e1b..ad9476a 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -1,12 +1,10 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.3 1997/03/14 07:53:55 simonpj Exp $
+# $Id: Makefile,v 1.11 2000/06/25 17:18:15 panne Exp $
 #
 
 TOP=.
 include $(TOP)/mk/boilerplate.mk
 
-line = @echo "------------------------------------------------------------------------------"
-
 #
 # subdir dependencies:
 #	everything needs utils
@@ -15,57 +13,28 @@ line = @echo "------------------------------------------------------------------
 #	RTS and compiler need includes
 #
 
-boot ::
-	$(line)
-	@echo "Booting Utils"
-	$(line)
-	@$(MAKE) -C utils boot depend
-
-	$(line)
-	@echo "Booting Driver"
-	$(line)
-	@$(MAKE) -C driver boot depend
-
-	$(line)
-	@echo "Booting Includes"
-	$(line)
-	@$(MAKE) -C includes boot depend
-
-	$(line)
-	@echo "Booting Runtime System"
-	$(line)
-	@$(MAKE) -C runtime boot depend
-
-	$(line)
-	@echo "Booting Docs"
-	$(line)
-	@$(MAKE) -C docs boot
-
-	$(line)
-	@echo "Booting Compiler"
-	$(line)
-	@$(MAKE) -C compiler boot
-
-	$(line)
-	@echo "Booting Prelude libraries"
-	$(line)
-	@$(MAKE) -C compiler boot
-
-
-# "CONTRIB" is also a SUBDIR, but there is nothing to build there.
-# 
-# leave out docs for the moment -- SOF
 #
-# Order is important! driver/ has to come before includes/ which
-# again has to come before the rest.
+# Order is important! It's e.g. necessary to descend into include/
+# before the rest to have a config.h, etc.
 #
 # If we're booting from .hc files, swap the order
 # we descend into compiler/ and lib/
 #
 ifeq "$(GhcWithHscBuiltViaC)" "NO"
-SUBDIRS = utils driver includes runtime compiler lib
+SUBDIRS = includes utils driver rts docs compiler lib
 else
-SUBDIRS = utils driver includes runtime lib compiler
+SUBDIRS = includes utils driver rts docs lib compiler
+endif
+
+# Easier to copy
+ifeq "$(BIN_DIST)" "1"
+SUBDIRS := $(filter-out docs,$(SUBDIRS))
 endif
 
+ifeq ($(IncludeTestDirsInBuild),YES)
+SUBDIRS += tests
+endif
+
+SRC_DIST_FILES += configure
+
 include $(TOP)/mk/target.mk