X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fmk%2Fpaths.mk;h=f9dd98b0cd38f0a015da5bf258bf6d019658232a;hb=7c03fd3bee98604426f7d879f53878d40f08d1a5;hp=be6dd7d13771e7a77952583e79a93120874d7ccf;hpb=67909e79eea6f0e9b2350d01d1322fde587bcc64;p=ghc-hetmet.git

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index be6dd7d..f9dd98b 100644
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: paths.mk,v 1.17 2000/01/10 11:59:55 simonmar Exp $
+# $Id: paths.mk,v 1.35 2001/07/05 13:31:09 sewardj Exp $
 #
 # ghc project specific make variables
 #
@@ -16,46 +16,50 @@ endif
 
 #-----------------------------------------------------------------------------
 # Extra things ``only for'' for the ghc project
+# 	These are all build-time things
 
-GHC_DRIVER_DIR	    	:= $(TOP)/driver
+GHC_INCLUDE_DIR   	:= $(TOP)/includes
 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_SYSMAN_DIR 		:= $(GHC_RUNTIME_DIR)/gum
-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
+# ---------------------------------------------------
+# -- 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_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
-GHC_SYSMAN    		= $(GHC_RUNTIME_DIR)/gum/SysMan
 
-UNLIT	 		= $(GHC_UNLIT_DIR)/unlit
-GHC_UNLIT		= $(GHC_UNLIT_DIR)/unlit
+PROJECT_DIR		:= ghc
+GHC_DRIVER_DIR	    	:= $(PROJECT_DIR)/driver
+GHC_UTILS_DIR	 	:= $(PROJECT_DIR)/utils
 
-#-----------------------------------------------------------------------------
-# Stuff for the C-compiling phase in particular...
+GHC_TOUCHY_DIR 		= $(GHC_UTILS_DIR)/touchy
 
-ifeq ($(HaveGcc), YES)
-GHC_OPT_HILEV_ASM 		= $(WhatGccIsCalled)
-else
-GHC_OPT_HILEV_ASM 		= $(CC)
-endif
+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
+