X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fmk%2Fpaths.mk;h=65faaed9ebabfc8da7c010c40eee1a8b2492d688;hb=c770cc2f062cdced907cbf2dbd5f3610edb17458;hp=635956a0c1b5be54d57d24b95ce36d1474b06619;hpb=2494407a750053daa61718fac371487d04818e57;p=ghc-hetmet.git

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index 635956a..65faaed 100644
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,24 +1,9 @@
 # -----------------------------------------------------------------------------
+# $Id: paths.mk,v 1.31 2001/05/27 23:55:07 sof Exp $
 #
 # ghc project specific make variables
 #
 
-# Override default haskell compiler if required
-#HC			= $(WithGhcHc)
-HaskellCompilerType	= $(WithGhcHcType)
-
-# What ways to build the RTS+libs
-WAYS=$(GhcLibWays)
-
-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
 
@@ -30,53 +15,25 @@ 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 			= $(GHC_DRIVER_DIR)/ghc
-GHC_HSCPP_DIR 		= $(GHC_UTILS_DIR)/hscpp
-GHC_HSCPP    		= $(GHC_HSCPP_DIR)/hscpp
-GHC_HSP    		= $(GHC_HSP_DIR)/hsp
-GHC_HSP_DIR 		= $(GHC_HSC_DIR)
-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
-
-#-----------------------------------------------------------------------------
-# 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
-
+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_UNLIT_DIR 		:= $(GHC_UTILS_DIR)/unlit
+GHC_TOUCHY_DIR 		:= $(GHC_UTILS_DIR)/touchy
+GHC_MANGLER_DIR 	:= $(GHC_DRIVER_DIR)/mangler
+GHC_SPLIT_DIR	 	:= $(GHC_DRIVER_DIR)/split
+
+GHC_UNLIT		= $(GHC_UNLIT_DIR)/unlit$(EXE_SUFFIX)
+GHC_TOUCHY              = $(GHC_TOUCHY_DIR)/touchy$(EXE_SUFFIX)
+GHC_MANGLER		= $(GHC_MANGLER_DIR)/ghc-asm
+GHC_SPLIT		= $(GHC_SPLIT_DIR)/ghc-split
+
+GHC_SYSMAN    		= $(GHC_RUNTIME_DIR)/parallel/SysMan
+GHC_SYSMAN_DIR 		= $(GHC_RUNTIME_DIR)/parallel