[project @ 2001-08-16 22:54:24 by sof]

[ghc-hetmet.git] / ghc / lib / std / Makefile

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 840302d..27037d1 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -56,8 +56,6 @@ PrelIO_HC_OPTS       += -fno-ignore-asserts
 # Special options
 PrelStorable_HC_OPTS = -monly-3-regs
 PrelCError_HC_OPTS   = +RTS -K4m -RTS
-PrelInt_HC_OPTS      = -monly-3-regs
-PrelWord_HC_OPTS     = -monly-3-regs
 
 #-----------------------------------------------------------------------------
 #      Dependency generation
@@ -65,12 +63,18 @@ PrelWord_HC_OPTS     = -monly-3-regs
 SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
 
 #-----------------------------------------------------------------------------
+#      Pre-processing (.pp) files
+SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR)
+
+#-----------------------------------------------------------------------------
 #      Rules
 
 PrelPrimopWrappers.hs: ../../compiler/prelude/primops.txt
-       rm -f PrelPrimopWrappers.hs
-       ../../utils/genprimopcode/genprimopcode  --make-haskell-wrappers \
-               < ../../compiler/prelude/primops.txt > PrelPrimopWrappers.hs
+       rm -f $@
+       ../../utils/genprimopcode/genprimopcode --make-haskell-wrappers < $< > $@
+
+PrelGHC.$(way_)hi      : PrelGHC.hi-boot
+       cp $< $@
 
 boot :: PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 
@@ -88,7 +92,7 @@ HS_SRCS := $(filter-out PrelMain.lhs, $(HS_SRCS))
 all :: PrelMain.dll_o
 endif
 
-CLEAN_FILES += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
+CLEAN_FILES += PrelGHC.hi-boot PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 
 
 #-----------------------------------------------------------------------------
@@ -172,7 +176,7 @@ ilxcheck:
 
 ifeq "$(ILXized)" "YES"
 
-SRC_HC_OPTS += -optI--assembly-name -optIstd.$(way_)o -optI--module
+SRC_HC_OPTS += -optI--assembly-name -optIstd.$(way_)o -optI--module -DILX
 
 HS_ILX+=PrelGHC.$(way_)o
 PrelGHC.$(way_)o: PrelGHC.ilx.real
@@ -181,9 +185,6 @@ PrelGHC.$(way_)o: PrelGHC.ilx.real
        $(ILASM) /QUIET /DLL /OUT=$@ $@.il
 #      mv $@.tmp $@
 
-PrelGHC.$(way_)hi: PrelGHC.hi-boot
-       cp $< $@
-
 std.dll: $(HS_OBJS)
        al -out:$@ $(HS_OBJS)
 
@@ -191,11 +192,7 @@ std.$(way_)mvl: $(HS_IL)
        ((ILVALID_HOME=c:\\devel\\fcom\\src\\ ILVALID_MSCORLIB=mscorlib.vlb $(ILVALID) c:\\devel\\fcom\\src\\bin\\msilxlib$(ilx2il_suffix).vlb $(HS_IL)) 2>&1) | tee $@
 
 std.$(way_)vlb: std.dll
-#      echo "call devcorb2gen fastchecked" > tmp.bat
-       echo "copy c:\\devel\\fcom\\bin\\msilxlib.$(ILX_WAY).dll msilxlib.$(ILX_WAY).dll" > tmp.bat
-       echo "copy c:\\devel\\fcom\\bin\\mkvlb.exe ." >> tmp.bat
-       echo "copy c:\\devel\\fcom\\bin\\mkvlb.pdb ." >> tmp.bat
-       echo ".\\mkvlb.exe -V -o $@.tmp std" >> tmp.bat
+       mkvlb.exe -V -o $@.tmp std
        cmd /c tmp.bat
        mv $@.tmp $@
 
@@ -214,3 +211,6 @@ endif # ILXized
 
 
 include $(TOP)/mk/target.mk
+
+# PrelIO.hsc includes PrelHandle_hsc.h
+PrelIO.hsc : PrelHandle_hsc.h