X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fmk%2Fpaths.mk;h=4453b0cf781f93d0bc726e2f70a18c795d67b165;hb=e1ac738d00eb2a5db0d20c49315f3247f970b61f;hp=0c33928f3d131c302f4e690ec5b778c93ba64a54;hpb=a8a4b4cff950c6c2e36d5a51e885fc74a9098724;p=ghc-hetmet.git

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index 0c33928..4453b0c 100644
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,21 +1,9 @@
 # -----------------------------------------------------------------------------
+# $Id: paths.mk,v 1.38 2001/09/10 12:57:59 simonmar Exp $
 #
 # ghc project specific make variables
 #
 
-# 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
 
@@ -27,52 +15,50 @@ HSTAGS_DIR 		= $(GHC_UTILS_DIR)/hstags
 endif
 
 #-----------------------------------------------------------------------------
-# Ugen
+# Extra things ``only for'' for the ghc project
+# 	These are all build-time things
 
-ifdef UseInstalledUtils
-UGEN		= ugen
-else
-UGEN		= $(UGEN_DIR)/ugen
-UGEN_DIR 	= $(GHC_UTILS_DIR)/ugen
-endif
+GHC_INCLUDE_DIR   	:= $(TOP)/includes
+GHC_COMPILER_DIR  	:= $(TOP)/compiler
+GHC_RUNTIME_DIR   	:= $(TOP)/rts
+GHC_LIB_DIR	 	:= $(TOP)/lib
 
-#-----------------------------------------------------------------------------
-# Extra things ``only for'' for the ghc project
+# ---------------------------------------------------
+# -- These variables are defined primarily so they can 
+# -- be spat into Config.hs by ghc/compiler/Makefile
+#
+# -- See comments in ghc/compiler/main/SysTools.lhs 
 
-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...
+PROJECT_DIR		:= ghc
+GHC_DRIVER_DIR	    	:= $(PROJECT_DIR)/driver
+GHC_UTILS_DIR	 	:= $(PROJECT_DIR)/utils
 
-ifeq ($(HaveGcc), YES)
-GHC_OPT_HILEV_ASM 		= $(WhatGccIsCalled)
-else
-GHC_OPT_HILEV_ASM 		= $(CC)
-endif
+GHC_TOUCHY_DIR 		= $(GHC_UTILS_DIR)/touchy
+
+GHC_UNLIT_DIR 		= $(GHC_UTILS_DIR)/unlit
+GHC_UNLIT		= unlit$(EXE_SUFFIX)
+
+GHC_MANGLER_DIR 	= $(GHC_DRIVER_DIR)/mangler
+GHC_MANGLER		= ghc-asm
+
+GHC_SPLIT_DIR	 	= $(GHC_DRIVER_DIR)/split
+GHC_SPLIT		= ghc-split
+
+GHC_SYSMAN    		= $(GHC_RUNTIME_DIR)/parallel/SysMan
+GHC_SYSMAN_DIR 		= $(GHC_RUNTIME_DIR)/parallel
+
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+
+GHC_CP			= "xcopy /y"
+GHC_PERL		= perl
+GHC_TOUCHY		= touchy$(EXE_SUFFIX)
 
-#
-# There's no need to compute dependencies when booting from .hc files
-#
-ifneq "$(GhcWithHscBuiltViaC)" "YES"
-MKDEPENDHS_SRCS = $(HS_SRCS)
 else
-MKDEPENDHS_SRCS =
+
+GHC_CP			= $(CP)
+GHC_PERL		= $(PERL)
+GHC_TOUCHY		= touch
+
 endif
 
-# temporary until the new RTS is merged in.
-MOSTLY_CLEAN_FILES += *.hc