[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 f74ed8b..ef4647b 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.84 2000/07/17 11:15:08 simonmar Exp $
+# $Id: Makefile,v 1.93 2000/09/29 15:59:28 sewardj Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -17,7 +17,11 @@ WAYS=$(GhcCompilerWays)
 # be to do ` env PATH=$(PATH) make hsc 'to minimise the environment. (or the
 # equivalent of `env' if it doesn't exist locally).
 #
+ifneq "$(way)" "dll"
 HS_PROG=hsc$(_way)
+else
+HS_PROG=hsc
+endif
 
 
 # -----------------------------------------------------------------------------
@@ -37,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)
@@ -218,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
 
@@ -225,6 +231,53 @@ SRC_C_OPTS     += -O -I. -IcodeGen
 
 
 # ----------------------------------------------------------------------------
+#              Generate supporting stuff for prelude/PrimOp.lhs 
+#              from prelude/primops.txt
+
+GENPOC=$(TOP)/utils/genprimopcode/genprimopcode
+
+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
 
 parser/hschooks.o : parser/hschooks.c
@@ -281,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) \