[project @ 2001-03-23 16:36:20 by simonmar]

[ghc-hetmet.git] / ghc / mk / paths.mk

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index 88e39ae..51d5ebc 100644 (file)
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: paths.mk,v 1.18 2000/01/13 14:34:02 hwloidl Exp $
+# $Id: paths.mk,v 1.30 2001/03/23 16:36:22 simonmar Exp $
 #
 # ghc project specific make variables
 #
@@ -25,37 +25,13 @@ GHC_INCLUDE_DIR     := $(TOP)/includes
 GHC_UTILS_DIR          := $(TOP)/utils
 GHC_INTERPRETER_DIR    := $(TOP)/interpreter
 
-GHC_HSP_DIR            := $(GHC_HSC_DIR)
-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_MANGLER_DIR        := $(GHC_DRIVER_DIR)/mangler
+GHC_SPLIT_DIR          := $(GHC_DRIVER_DIR)/split
 
-GHC_INPLACE            = $(GHC_DRIVER_DIR)/ghc-inplace
-GHC_HSCPP              = $(GHC_HSCPP_DIR)/hscpp
-GHC_MKDEPENDHS                 = $(GHC_MKDEPENDHS_DIR)/mkdependHS-inplace
-GHC_HSP                = $(GHC_HSP_DIR)/hsp
-GHC_HSC                = $(GHC_HSC_DIR)/hsc
-UNLIT                  = $(GHC_UNLIT_DIR)/unlit
-GHC_UNLIT              = $(GHC_UNLIT_DIR)/unlit
+GHC_UNLIT              = $(GHC_UNLIT_DIR)/unlit$(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
-
-#-----------------------------------------------------------------------------
-# Stuff for the C-compiling phase in particular...
-
-ifeq ($(HaveGcc), YES)
-GHC_OPT_HILEV_ASM              = $(WhatGccIsCalled)
-else
-GHC_OPT_HILEV_ASM              = $(CC)
-endif
-
-#
-# There's no need to compute dependencies when booting from .hc files
-#
-ifneq "$(GhcWithHscBuiltViaC)" "YES"
-MKDEPENDHS_SRCS = $(HS_SRCS)
-else
-MKDEPENDHS_SRCS =
-endif