[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 ff7850d..51d5ebc 100644 (file)
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,17 +1,9 @@
 # -----------------------------------------------------------------------------
+# $Id: paths.mk,v 1.30 2001/03/23 16:36:22 simonmar Exp $
 #
 # ghc project specific make variables
 #
 
-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
 
@@ -23,52 +15,23 @@ 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)/rts
-GHC_LIB_DIR            = $(TOP)/lib
-GHC_INCLUDE_DIR        = $(TOP)/includes
-GHC_UTILS_DIR          = $(TOP)/utils
-GHC_INTERPRETER_DIR    = $(TOP)/interpreter
+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-inplace
-GHC_HSCPP_DIR          = $(GHC_UTILS_DIR)/hscpp
-GHC_HSCPP              = $(GHC_HSCPP_DIR)/hscpp
-GHC_MKDEPENDHS_DIR     = $(GHC_UTILS_DIR)/mkdependHS
-GHC_MKDEPENDHS                 = $(GHC_MKDEPENDHS_DIR)/mkdependHS-inplace
-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
+GHC_UNLIT_DIR          := $(GHC_UTILS_DIR)/unlit
+GHC_MANGLER_DIR        := $(GHC_DRIVER_DIR)/mangler
+GHC_SPLIT_DIR          := $(GHC_DRIVER_DIR)/split
 
-#-----------------------------------------------------------------------------
-# Stuff for the C-compiling phase in particular...
-
-ifeq ($(HaveGcc), YES)
-GHC_OPT_HILEV_ASM              = $(WhatGccIsCalled)
-else
-GHC_OPT_HILEV_ASM              = $(CC)
-endif
+GHC_UNLIT              = $(GHC_UNLIT_DIR)/unlit$(EXE_SUFFIX)
+GHC_MANGLER            = $(GHC_MANGLER_DIR)/ghc-asm
+GHC_SPLIT              = $(GHC_SPLIT_DIR)/ghc-split
 
-#
-# There's no need to compute dependencies when booting from .hc files
-#
-ifneq "$(GhcWithHscBuiltViaC)" "YES"
-MKDEPENDHS_SRCS = $(HS_SRCS)
-else
-MKDEPENDHS_SRCS =
-endif
+GHC_SYSMAN             = $(GHC_RUNTIME_DIR)/parallel/SysMan
+GHC_SYSMAN_DIR                 = $(GHC_RUNTIME_DIR)/parallel