X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2FMakefile;h=d496a0899252c06fefab63f6a82f207636b9d6e4;hb=d0bf18ef6ff50e8764231537f1052a81ac65b229;hp=39ea131adf288796f23c059a0981e5af230e927d;hpb=0fc38bc29078ca6d2829615441c477c006aae7d4;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 39ea131..d496a08 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.206 2002/02/01 15:18:18 simonmar Exp $
+# $Id: Makefile,v 1.213 2002/03/04 17:01:27 simonmar Exp $
 
 TOP = ..
 
@@ -61,17 +61,18 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
 	@echo "cRAWCPP_FLAGS         = \"$(RAWCPP_FLAGS)\"" >> $(CONFIG_HS)
 	@echo "cGCC                  = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS)
 	@echo "cMKDLL                = \"$(BLD_DLL)\"" >> $(CONFIG_HS)
-	@echo "cGHC_DRIVER_DIR       = \"$(GHC_DRIVER_DIR)\"" >> $(CONFIG_HS)
-	@echo "cGHC_TOUCHY           = \"$(GHC_TOUCHY)\"" >> $(CONFIG_HS)
-	@echo "cGHC_TOUCHY_DIR       = \"$(GHC_TOUCHY_DIR)\"" >> $(CONFIG_HS)
-	@echo "cGHC_UNLIT            = \"$(GHC_UNLIT)\"" >> $(CONFIG_HS)
-	@echo "cGHC_UNLIT_DIR        = \"$(GHC_UNLIT_DIR)\"" >> $(CONFIG_HS)
-	@echo "cGHC_MANGLER          = \"$(GHC_MANGLER)\"" >> $(CONFIG_HS)
-	@echo "cGHC_MANGLER_DIR      = \"$(GHC_MANGLER_DIR)\"" >> $(CONFIG_HS)
-	@echo "cGHC_SPLIT            = \"$(GHC_SPLIT)\"" >> $(CONFIG_HS)
-	@echo "cGHC_SPLIT_DIR        = \"$(GHC_SPLIT_DIR)\"" >> $(CONFIG_HS)
-	@echo "cGHC_SYSMAN           = \"$(GHC_SYSMAN)\"" >> $(CONFIG_HS)
-	@echo "cGHC_SYSMAN_DIR       = \"$(GHC_SYSMAN_DIR)\"" >> $(CONFIG_HS)
+	@echo "cPROJECT_DIR          = \"$(PROJECT_DIR)\"" >> $(CONFIG_HS)
+	@echo "cGHC_DRIVER_DIR_REL   = \"$(GHC_DRIVER_DIR_REL)\"" >> $(CONFIG_HS)
+	@echo "cGHC_TOUCHY_PGM       = \"$(GHC_TOUCHY_PGM)\"" >> $(CONFIG_HS)
+	@echo "cGHC_TOUCHY_DIR_REL   = \"$(GHC_TOUCHY_DIR_REL)\"" >> $(CONFIG_HS)
+	@echo "cGHC_UNLIT_PGM        = \"$(GHC_UNLIT_PGM)\"" >> $(CONFIG_HS)
+	@echo "cGHC_UNLIT_DIR_REL    = \"$(GHC_UNLIT_DIR_REL)\"" >> $(CONFIG_HS)
+	@echo "cGHC_MANGLER_PGM      = \"$(GHC_MANGLER_PGM)\"" >> $(CONFIG_HS)
+	@echo "cGHC_MANGLER_DIR_REL  = \"$(GHC_MANGLER_DIR_REL)\"" >> $(CONFIG_HS)
+	@echo "cGHC_SPLIT_PGM        = \"$(GHC_SPLIT_PGM)\"" >> $(CONFIG_HS)
+	@echo "cGHC_SPLIT_DIR_REL    = \"$(GHC_SPLIT_DIR_REL)\"" >> $(CONFIG_HS)
+	@echo "cGHC_SYSMAN_PGM       = \"$(GHC_SYSMAN)\"" >> $(CONFIG_HS)
+	@echo "cGHC_SYSMAN_DIR_REL   = \"$(GHC_SYSMAN_DIR)\"" >> $(CONFIG_HS)
 	@echo "cGHC_CP               = \"$(GHC_CP)\"" >> $(CONFIG_HS)
 	@echo "cGHC_PERL             = \"$(GHC_PERL)\"" >> $(CONFIG_HS)
 ifeq ($(GhcWithIlx),YES)
@@ -96,7 +97,7 @@ CLEAN_FILES += $(CONFIG_HS)
 ALL_DIRS = \
   utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
   specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \
-  profiling parser usageSP cprAnalysis compMan
+  profiling parser usageSP cprAnalysis compMan ndpFlatten
 
 # Make sure we include Config.hs even if it doesn't exist yet...
 ALL_SRCS += $(CONFIG_HS)
@@ -122,7 +123,7 @@ ifeq "$(BootingFromHc)" "YES"
 bootstrapped = YES
 compiling_with_4xx=NO
 else
-bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt)); then echo YES; else echo NO; fi)
+bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt) -a $(GhcPatchLevel) -ge $(ProjectPatchLevel)); then echo YES; else echo NO; fi)
 compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 500); then echo YES; else echo NO; fi)
 ghc_502_at_least = $(shell if (test $(GhcCanonVersion) -ge 502); then echo YES; else echo NO; fi)
 endif
@@ -145,27 +146,6 @@ endif
 HS_OBJS	 += $(C_OBJS)
 
 # -----------------------------------------------
-# system hack.
-#
-# GHCi calls the C procedure 'rawSystem'; but alas GHC 4.08 
-# does not have this.  Everything is fine if you are compiling
-# GHC with GHC 5.02 or better, but lacking that we have the following
-# hack: 
-#	copy rawSystem.c from hslibs/lang/cbits
-#	into main/ (where it'll be compiled and linked with the compiler)
-#       (the Haskell-side code is ifdefed into main/SysTools.lhs)
-
-ifneq "$(bootstrapped)" "YES"
-SRC_CC_OPTS += -I$(GHC_LIB_DIR)/std/cbits
-SRC_MKDEPENDC_OPTS += -I$(GHC_LIB_DIR)/std/cbits
-ALL_SRCS += main/rawSystem.c
-main/rawSystem.c : $(FPTOOLS_TOP)/hslibs/lang/cbits/rawSystem.c
-	$(CP) $< main
-else
-EXCLUDED_SRCS = main/rawSystem.c
-endif
-
-# -----------------------------------------------
 # mkdependC stuff
 #
 # Big Fudge to get around inherent problem that Makefile setup
@@ -208,9 +188,9 @@ SRC_HC_OPTS += \
 SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
 
 ifneq "$(mingw32_TARGET_OS)" "1"
-SRC_HC_OPTS += -package concurrent -package posix -package text -package util
+SRC_HC_OPTS += -package concurrent -package posix -package util
 else
-SRC_HC_OPTS += -package concurrent -package text -package util
+SRC_HC_OPTS += -package concurrent -package util
 endif
 
 SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
@@ -382,6 +362,14 @@ else
 INSTALL_PROGS += $(HS_PROG)
 endif
 
+# ----------------------------------------------------------------------------
+# profiling.
+
+rename/Rename_HC_OPTS += -auto-all
+rename/RnEnv_HC_OPTS += -auto-all
+rename/RnHiFiles_HC_OPTS += -auto-all
+rename/RnSource_HC_OPTS += -auto-all
+
 #-----------------------------------------------------------------------------
 # 		clean