X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fmk%2Fpaths.mk;h=1adeefc3315894b4017fb1721f2d6f94c96c54df;hb=c75dc9b327e279f94a43c17683136818e307df75;hp=3a69dd0d8e9bdd1271fc605b6291fef85bca312b;hpb=e3f0d880b7b74ed95059a8cddf3edf3e0d2f83c6;p=ghc-hetmet.git

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index 3a69dd0..1adeefc 100644
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,27 +1,9 @@
 # -----------------------------------------------------------------------------
+# $Id: paths.mk,v 1.19 2000/01/14 10:18:37 simonmar Exp $
 #
 # ghc project specific make variables
 #
 
-#
-PROJECTVERSION=$(GhcProjectVersion)
-PROJECTNAME=$(GhcProjectName)
-PROJECTPATCHLEVEL=$(GhcProjectPatchLevel)
-
-
-# Override default haskell compiler if required
-#HC			= $(WithGhcHc)
-HaskellCompilerType	= $(WithGhcHcType)
-
-GCap=-optc-DGCap
-#GC2s=-optc-DGC2s
-#GC1s=-optc-DGC1s
-
-MKDEPENDHSSRC 		= $(GHC_UTILS_DIR)/mkdependHS
-UNLIT	 		= $(GHC_UNLIT_DIR)/unlit
-GHC_UNLIT		= $(GHC_UNLIT_DIR)/unlit
-GHC_UNLIT_DIR 		= $(GHC_UTILS_DIR)/unlit
-
 #-----------------------------------------------------------------------------
 # HsTags
 
@@ -33,53 +15,45 @@ HSTAGS_DIR 		= $(GHC_UTILS_DIR)/hstags
 endif
 
 #-----------------------------------------------------------------------------
-# Ugen
-
-ifdef UseInstalledUtils
-UGEN		= ugen
-else
-UGEN		= $(UGEN_DIR)/ugen
-UGEN_DIR 	= $(GHC_UTILS_DIR)/ugen
-endif
-
-#-----------------------------------------------------------------------------
 # Extra things ``only for'' for the ghc project
 
-GHC_DRIVER_DIR	    	= $(TOP)/driver
-GHC_COMPILER_DIR  	= $(TOP)/compiler
-GHC_RUNTIME_DIR   	= $(TOP)/runtime
-GHC_LIB_DIR	 	= $(TOP)/lib
-GHC_INCLUDE_DIR   	= $(TOP)/includes
-GHC_UTILS_DIR	 	= $(TOP)/utils
+GHC_DRIVER_DIR	    	:= $(TOP)/driver
+GHC_COMPILER_DIR  	:= $(TOP)/compiler
+GHC_RUNTIME_DIR   	:= $(TOP)/rts
+GHC_LIB_DIR	 	:= $(TOP)/lib
+GHC_INCLUDE_DIR   	:= $(TOP)/includes
+GHC_UTILS_DIR	 	:= $(TOP)/utils
+GHC_INTERPRETER_DIR 	:= $(TOP)/interpreter
 
-GHC 			= $(GHC_DRIVER_DIR)/ghc
-GHC_HSCPP_DIR 		= $(GHC_UTILS_DIR)/hscpp
+GHC_MKDEPENDHS_DIR	:= $(GHC_UTILS_DIR)/mkdependHS
+GHC_HSCPP_DIR 		:= $(GHC_UTILS_DIR)/hscpp
+GHC_HSC_DIR 		:= $(GHC_COMPILER_DIR)
+GHC_UNLIT_DIR 		:= $(GHC_UTILS_DIR)/unlit
+
+GHC_INPLACE		= $(GHC_DRIVER_DIR)/ghc-inplace
 GHC_HSCPP    		= $(GHC_HSCPP_DIR)/hscpp
-GHC_HSP    		= $(GHC_HSP_DIR)/hsp
-GHC_HSP_DIR 		= $(GHC_HSC_DIR)
+GHC_MKDEPENDHS 		= $(GHC_MKDEPENDHS_DIR)/mkdependHS-inplace
 GHC_HSC    		= $(GHC_HSC_DIR)/hsc
-GHC_HSC_DIR 		= $(GHC_COMPILER_DIR)
-GHC_SYSMAN    		= $(GHC_RUNTIME_DIR)/gum/SysMan
-GHC_SYSMAN_DIR 		= $(GHC_RUNTIME_DIR)/gum
+UNLIT	 		= $(GHC_UNLIT_DIR)/unlit
+GHC_UNLIT		= $(GHC_UNLIT_DIR)/unlit
+
+GHC_SYSMAN    		= $(GHC_RUNTIME_DIR)/parallel/SysMan
+GHC_SYSMAN_DIR 		= $(GHC_RUNTIME_DIR)/parallel
 
 #-----------------------------------------------------------------------------
 # Stuff for the C-compiling phase in particular...
 
-# NON-OPTIMISING C COMPILATION: =================================
-
-ifeq ($(HaveGcc), YES)
-GHC_DEBUG_HILEV_ASM 		= $(WhatGccIsCalled)
-else
-GHC_DEBUG_HILEV_ASM 		= $(CC)
-endif
-
-# OPTIMISING C COMPILATION (regs, etc): ==========================
-
 ifeq ($(HaveGcc), YES)
 GHC_OPT_HILEV_ASM 		= $(WhatGccIsCalled)
-GHC_GCC_IS_AVAILABLE 		= 1
 else
 GHC_OPT_HILEV_ASM 		= $(CC)
-GHC_GCC_IS_AVAILABLE 		= 0
 endif
 
+#
+# There's no need to compute dependencies when booting from .hc files
+#
+ifneq "$(GhcWithHscBuiltViaC)" "YES"
+MKDEPENDHS_SRCS = $(HS_SRCS)
+else
+MKDEPENDHS_SRCS =
+endif