X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=ef4647b930380b4271edc5c7ef59f8094b07490d;hb=fa869cdd81d44d9167c1a54b3adae485996a1991;hp=2a31e8730520b7c98a16e7babd56d0c2aa27a2a8;hpb=bcf0e15354eda145deff27bc84ad6009774ae926;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 2a31e87..ef4647b 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.79 2000/05/28 16:06:52 panne 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)
@@ -107,7 +111,7 @@ space:= $(empty) $(empty)
 SRC_HC_OPTS += \
   -cpp -fglasgow-exts -Rghc-timing \
   -I. -IcodeGen -InativeGen -Iparser \
-  -i$(subst $(space),:,$(DIRS))
+  -i$(subst $(space),:,$(DIRS)) 
 
 SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
 
@@ -147,10 +151,8 @@ parser/Lex_HC_OPTS		= -fvia-C -K2m -H16m
 parser/Ctype_HC_OPTS		= -K2m -fvia-C
 
 rename/ParseIface_HC_OPTS 	+= -Onot -H45m -K2m -fno-warn-incomplete-patterns
-rename/ParseIface_HAPPY_OPTS    += -g
 
 parser/Parser_HC_OPTS 		+= -Onot -H80m -optCrts-M80m -K2m -fno-warn-incomplete-patterns
-parser/Parser_HAPPY_OPTS    	+= -g
 
 ifeq "$(TARGETPLATFORM)" "hppa1.1-hp-hpux9"
 rename/RnMonad_HC_OPTS 		=  -O2 -O2-for-C
@@ -189,11 +191,13 @@ typecheck/TcBinds_HC_OPTS       = -H10m
 typecheck/TcEnv_HC_OPTS		= -H10m
 utils/Argv_HC_OPTS 		= -fvia-C
 utils/SST_HC_OPTS 		= 
-utils/FastString_HC_OPTS	= 
 utils/StringBuffer_HC_OPTS	= -fvia-C -fno-prune-tydecls
 utils/Digraph_HC_OPTS		= -fglasgow-exts 
 utils/DirUtils_HC_OPTS 		= 
 
+# temporary, due to bug in NCG  (SDM, 1/6/2000)
+utils/FastString_HC_OPTS	= -fvia-C
+
 ifeq "$(alpha_HOST_ARCH)" "1"
 # "stbu" bug in alpha native code generator...
 basicTypes/Unique_HC_OPTS	= 
@@ -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
@@ -233,16 +286,16 @@ parser/hschooks.o : parser/hschooks.c
 
 
 # Interface-file parser uses Happy
-SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS
+SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS  $(GHC_HAPPY_OPTS)
 
 rename/ParseIface.hs : rename/ParseIface.y
 	@$(RM) rename/ParseIface.hs rename/ParseIface.hinfo
-	$(HAPPY) $(HAPPY_OPTS) -g rename/ParseIface.y
+	$(HAPPY) $(HAPPY_OPTS) rename/ParseIface.y
 	@chmod 444 rename/ParseIface.hs
 
 parser/Parser.hs : parser/Parser.y
 	@$(RM) parser/Parser.hs parser/ParseIface.hinfo
-	$(HAPPY) $(HAPPY_OPTS) -g parser/Parser.y
+	$(HAPPY) $(HAPPY_OPTS) parser/Parser.y
 	@chmod 444 parser/Parser.hs
 
 #-----------------------------------------------------------------------------
@@ -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) \