[project @ 2000-08-08 15:16:09 by sewardj]

Give the included bits of Haskell their own rules in the Makefile, so
that make boot/depend work properly.

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 9a0fd79..8697ca4 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.87 2000/08/08 15:16:09 sewardj Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -234,31 +234,44 @@ 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.lhs: $(PRIMOP_BITS)
+
+primop-data-decl.hs-incl: prelude/primops.txt
+       $(GENPOC) --data-decl          < prelude/primops.txt > primop-data-decl.hs-incl
+primop-tag.hs-incl: prelude/primops.txt
+       $(GENPOC) --primop-tag         < prelude/primops.txt > primop-tag.hs-incl
+primop-list.hs-incl: prelude/primops.txt
+       $(GENPOC) --primop-list        < prelude/primops.txt > primop-list.hs-incl
+primop-has-side-effects.hs-incl: prelude/primops.txt
+       $(GENPOC) --has-side-effects   < prelude/primops.txt > primop-has-side-effects.hs-incl
+primop-out-of-line.hs-incl: prelude/primops.txt
+       $(GENPOC) --out-of-line        < prelude/primops.txt > primop-out-of-line.hs-incl
+primop-commutable.hs-incl: prelude/primops.txt
+       $(GENPOC) --commutable         < prelude/primops.txt > primop-commutable.hs-incl
+primop-needs-wrapper.hs-incl: prelude/primops.txt
+       $(GENPOC) --needs-wrapper      < prelude/primops.txt > primop-needs-wrapper.hs-incl
+primop-can-fail.hs-incl: prelude/primops.txt
+       $(GENPOC) --can-fail           < prelude/primops.txt > primop-can-fail.hs-incl
+primop-strictness.hs-incl: prelude/primops.txt
+       $(GENPOC) --strictness         < prelude/primops.txt > primop-strictness.hs-incl
+primop-usage.hs-incl: prelude/primops.txt
+       $(GENPOC) --usage              < prelude/primops.txt > primop-usage.hs-incl
+primop-primop-info.hs-incl: prelude/primops.txt
+       $(GENPOC) --primop-primop-info < prelude/primops.txt > primop-primop-info.hs-incl
+
+
 
 # ----------------------------------------------------------------------------
 #              Parsers/lexers
@@ -317,6 +330,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) \

diff --git a/ghc/compiler/prelude/PrimOp.lhs b/ghc/compiler/prelude/PrimOp.lhs
index 9b7681f..e6ced5a 100644 (file)
--- a/ghc/compiler/prelude/PrimOp.lhs
+++ b/ghc/compiler/prelude/PrimOp.lhs
@@ -62,7 +62,7 @@ These are in \tr{state-interface.verb} order.
 
 -- supplies: 
 -- data PrimOp = ...
-#include "primop-data-decl.hs"
+#include "primop-data-decl.hs-incl"
     | CCallOp CCall          -- and don't forget to add CCall
 \end{code}
 
@@ -74,7 +74,7 @@ primOpTag op = IBOX( tagOf_PrimOp op )
 
 -- supplies   
 -- tagOf_PrimOp :: PrimOp -> FAST_INT
-#include "primop-tag.hs"
+#include "primop-tag.hs-incl"
 tagOf_PrimOp op = pprPanic# "tagOf_PrimOp: pattern-match" (ppr op)
 
 
@@ -101,7 +101,7 @@ An @Enum@-derived list would be better; meanwhile... (ToDo)
 \begin{code}
 allThePrimOps :: [PrimOp]
 allThePrimOps =
-#include "primop-list.hs"
+#include "primop-list.hs-incl"
 -- Doesn't include CCall, which is really a family of primops
 \end{code}
 
@@ -153,7 +153,7 @@ primOpStrictness :: PrimOp -> Arity -> StrictnessInfo
        -- See Demand.StrictnessInfo for discussion of what the results
        -- The arity should be the arity of the primop; that's why
        -- this function isn't exported.
-#include "primop-strictness.hs"
+#include "primop-strictness.hs-incl"
 \end{code}
 
 %************************************************************************
@@ -167,7 +167,7 @@ else, notably a type, can be constructed) for each @PrimOp@.
 
 \begin{code}
 primOpInfo :: PrimOp -> PrimOpInfo
-#include "primop-primop-info.hs"
+#include "primop-primop-info.hs-incl"
 \end{code}
 
 Here are a load of comments from the old primOp info:
@@ -337,7 +337,7 @@ perform a heap check or they block.
 
 \begin{code}
 primOpOutOfLine (CCallOp c_call) = ccallMayGC c_call
-#include "primop-out-of-line.hs"
+#include "primop-out-of-line.hs-incl"
 \end{code}
 
 
@@ -397,7 +397,7 @@ primOpIsDupable op = not (primOpNeedsWrapper op)
 
 \begin{code}
 primOpCanFail :: PrimOp -> Bool
-#include "primop-can-fail.hs"
+#include "primop-can-fail.hs-incl"
 \end{code}
 
 And some primops have side-effects and so, for example, must not be
@@ -406,7 +406,7 @@ duplicated.
 \begin{code}
 primOpHasSideEffects :: PrimOp -> Bool
 primOpHasSideEffects (CCallOp _)       = True
-#include "primop-has-side-effects.hs"
+#include "primop-has-side-effects.hs-incl"
 \end{code}
 
 Inline primitive operations that perform calls need wrappers to save
@@ -415,7 +415,7 @@ any live variables that are stored in caller-saves registers.
 \begin{code}
 primOpNeedsWrapper :: PrimOp -> Bool
 primOpNeedsWrapper (CCallOp _)                 = True
-#include "primop-needs-wrapper.hs"
+#include "primop-needs-wrapper.hs-incl"
 \end{code}
 
 \begin{code}
@@ -481,7 +481,7 @@ primOpSig op
 
 primOpUsg :: PrimOp -> ([TyVar],[Type],Type)
 primOpUsg p@(CCallOp _) = mangle p [] mkM
-#include "primop-usage.hs"
+#include "primop-usage.hs-incl"
 
 -- Things with no Haskell pointers inside: in actuality, usages are
 -- irrelevant here (hence it doesn't matter that some of these
@@ -553,7 +553,7 @@ to the right hand side for strength reduction.
 
 \begin{code}
 commutableOp :: PrimOp -> Bool
-#include "primop-commutable.hs"
+#include "primop-commutable.hs-incl"
 \end{code}
 
 Utils: