[project @ 2000-09-29 15:59:28 by sewardj]

[ghc-hetmet.git] / ghc / compiler / Makefile

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 9a0fd79..ef4647b 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.86 2000/08/07 14:11:48 sewardj Exp $
+# $Id: Makefile,v 1.93 2000/09/29 15:59:28 sewardj Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -41,7 +41,7 @@ $(HS_PROG) :: $(HS_SRCS)
 DIRS = \
   utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
   specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \
-  profiling parser usageSP cprAnalysis javaGen
+  profiling parser usageSP cprAnalysis javaGen ghci
 
 
 ifeq ($(GhcWithNativeCodeGen),YES)
@@ -222,6 +222,8 @@ utils/PrimPacked_HC_OPTS    = -fvia-C -monly-3-regs -optC-funfolding-interface-thre
 # separate bugfix to the fixpoint finder.
 simplStg/UpdAnal_HC_OPTS       = -fno-strictness
 
+stgSyn/StgInterp_HC_OPTS       = -fvia-C
+
 # ----------------------------------------------------------------------------
 #              C compilations
 
@@ -234,31 +236,46 @@ SRC_C_OPTS     += -O -I. -IcodeGen
 
 GENPOC=$(TOP)/utils/genprimopcode/genprimopcode
 
-prelude/PrimOp.o : prelude/PrimOp.lhs prelude/primops.txt
-       $(RM) primop-data-decl.hs
-       $(RM) primop-tag
-       $(RM) primop-list
-       $(RM) primop-has-side-effects.hs
-       $(RM) primop-out-of-line.hs
-       $(RM) primop-commutable.hs
-       $(RM) primop-needs-wrapper.hs
-       $(RM) primop-can-fail.hs
-       $(RM) primop-strictness.hs
-       $(RM) primop-usage.hs
-       $(RM) primop-primop-info.hs
-       $(GENPOC) --data-decl          < prelude/primops.txt > primop-data-decl.hs
-       $(GENPOC) --primop-tag         < prelude/primops.txt > primop-tag.hs
-       $(GENPOC) --primop-list        < prelude/primops.txt > primop-list.hs
-       $(GENPOC) --has-side-effects   < prelude/primops.txt > primop-has-side-effects.hs
-       $(GENPOC) --out-of-line        < prelude/primops.txt > primop-out-of-line.hs
-       $(GENPOC) --commutable         < prelude/primops.txt > primop-commutable.hs
-       $(GENPOC) --needs-wrapper      < prelude/primops.txt > primop-needs-wrapper.hs
-       $(GENPOC) --can-fail           < prelude/primops.txt > primop-can-fail.hs
-       $(GENPOC) --strictness         < prelude/primops.txt > primop-strictness.hs
-       $(GENPOC) --usage              < prelude/primops.txt > primop-usage.hs
-       $(GENPOC) --primop-primop-info < prelude/primops.txt > primop-primop-info.hs
-       $(RM) $@
-       $(HC) -c -o $@ $(HC_OPTS) prelude/PrimOp.lhs
+PRIMOP_BITS=primop-data-decl.hs-incl \
+            primop-tag.hs-incl  \
+            primop-list.hs-incl  \
+            primop-has-side-effects.hs-incl  \
+            primop-out-of-line.hs-incl  \
+            primop-commutable.hs-incl  \
+            primop-needs-wrapper.hs-incl  \
+            primop-can-fail.hs-incl  \
+            primop-strictness.hs-incl  \
+            primop-usage.hs-incl  \
+            primop-primop-info.hs-incl
+
+prelude/PrimOp.o: $(PRIMOP_BITS)
+
+depend :: $(PRIMOP_BITS)
+
+primop-data-decl.hs-incl: prelude/primops.txt
+       $(GENPOC) --data-decl          < $< > $@
+primop-tag.hs-incl: prelude/primops.txt
+       $(GENPOC) --primop-tag         < $< > $@
+primop-list.hs-incl: prelude/primops.txt
+       $(GENPOC) --primop-list        < $< > $@
+primop-has-side-effects.hs-incl: prelude/primops.txt
+       $(GENPOC) --has-side-effects   < $< > $@
+primop-out-of-line.hs-incl: prelude/primops.txt
+       $(GENPOC) --out-of-line        < $< > $@
+primop-commutable.hs-incl: prelude/primops.txt
+       $(GENPOC) --commutable         < $< > $@
+primop-needs-wrapper.hs-incl: prelude/primops.txt
+       $(GENPOC) --needs-wrapper      < $< > $@
+primop-can-fail.hs-incl: prelude/primops.txt
+       $(GENPOC) --can-fail           < $< > $@
+primop-strictness.hs-incl: prelude/primops.txt
+       $(GENPOC) --strictness         < $< > $@
+primop-usage.hs-incl: prelude/primops.txt
+       $(GENPOC) --usage              < $< > $@
+primop-primop-info.hs-incl: prelude/primops.txt
+       $(GENPOC) --primop-primop-info < $< > $@
+
+
 
 # ----------------------------------------------------------------------------
 #              Parsers/lexers
@@ -317,6 +334,7 @@ endif
 #              clean
 
 CLEAN_FILES += $(wildcard */*.$(way_)o */*.$(way_)hi)
+CLEAN_FILES += $(PRIMOP_BITS)
 
 # Extra tidy, remove the .hc files (if you've got them).
 MAINTAINER_CLEAN_FILES += $(wildcard */*.hc) \