X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=1386d2c69d4c014481abee0c47d00cee0b994947;hb=d03fd455b676500a40ce065c1b0b2b53e0849bfa;hp=effd0a9e7a4fc848cce39883eb32abb4763cb0f2;hpb=02b60157852c1bf3c371b47c33d83814a05153bc;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index effd0a9..1386d2c 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -1,79 +1,34 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.2 1996/11/21 16:46:26 simonm Exp $
+# $Id: Makefile,v 1.7 1997/03/24 08:39:19 sof Exp $
+#
 
-TOP=..
-include $(TOP)/ghc/mk/ghc.mk
+TOP=.
+include $(TOP)/mk/boilerplate.mk
 
-line = @echo "------------------------------------------------------------------------------"
-
-define BuildLibs
-$(line)
-@echo "Building Libraries"
-$(line)
-@$(MAKE) -C lib depend all
-endef
-
-define BuildCompiler
-$(line)
-@echo "Building Compiler"
-$(line)
-@$(MAKE) -C compiler depend all
-endef
-
-# dependencies:
+#
+# subdir dependencies:
 #	everything needs utils
-#	includes needs driver (for mkNativeGen.c)
+#	includes/ needs driver (to easily c.pile mkNativeGen.c)
 #	make depend except in {utils,driver} needs includes	
 #	RTS and compiler need includes
-
-boot ::
-	$(line)
-	@echo "Building Utils"
-	$(line)
-	@$(MAKE) -C utils depend all
-
-	$(line)
-	@echo "Building Driver"
-	$(line)
-	@$(MAKE) -C driver all
-
-	$(line)
-	@echo "Building Includes"
-	$(line)
-	@$(MAKE) -C includes all
-
-	$(line)
-	@echo "Building Runtime System"
-	$(line)
-	@$(MAKE) -C runtime depend all
-
-	$(line)
-	@echo "Building Docs"
-	$(line)
-	@$(MAKE) -C docs depend all
-
-ifeq ($(HaskellCompilerType), HC_USE_HC_FILES)
-	$(BuildLibs)
-	$(BuildCompiler)
+#
+
+#
+# Order is important! driver/ has to come before includes/ which
+# again has to come before the rest.
+#
+# If we're booting from .hc files, swap the order
+# we descend into compiler/ and lib/
+#
+ifeq "$(GhcWithHscBuiltViaC)" "NO"
+SUBDIRS = utils driver includes runtime docs compiler lib
 else
-	$(BuildCompiler)
-	$(BuildLibs)
+SUBDIRS = utils driver includes runtime docs lib compiler
 endif
 
-# "CONTRIB" is also a SUBDIR, but there is nothing to build there.
-SUBDIRS = utils driver includes runtime docs compiler lib
-
-# Make the required directories for install.
-
-install_dirs ::
-	$(MKDIRHIER) $(INSTBINDIR_GHC)
-	$(MKDIRHIER) $(INSTSCRIPTDIR_GHC)
-	$(MKDIRHIER) $(INSTLIBDIR_GHC)
-	$(MKDIRHIER) $(INSTLIBDIR_GHC)/includes
-	$(MKDIRHIER) $(INSTDATADIR_GHC)
-	$(MKDIRHIER) $(INSTDATADIR_GHC)/includes
-	$(MKDIRHIER) $(INSTDATADIR_GHC)/imports
-
-install :: install_dirs
+# Easier to copy
+ifeq "$(BIN_DIST)" "1"
+SUBDIRS := $(filter-out docs,$(SUBDIRS))
+endif
 
-include $(TOP)/mk/subdir.mk
+include $(TOP)/mk/target.mk