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

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 3b745ad..ef4647b 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,4 +1,5 @@
 # -----------------------------------------------------------------------------
+# $Id: Makefile,v 1.93 2000/09/29 15:59:28 sewardj Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -7,28 +8,27 @@ include $(TOP)/mk/boilerplate.mk
 # Building hsc different ways (default is just `normal' sequential)
 WAYS=$(GhcCompilerWays)
 
-#-----------------------------------------------------------------------------
-#		Set SUBDIRS
-
-ifeq ($(IncludeTestDirsInBuild),YES)
-  SUBDIRS = tests
-endif
-
 # -----------------------------------------------------------------------------
 #		Set HS_PROG, LIBRARY
-# Setting HS_PROG and LIBRARY causes all targets in target.mk
-# (included below) to kick in.
 
-LIBRARY=libhsp.a
-
-#
 # Note: there have been reports of people running up against the ARG_MAX limit
 # when linking hsc with all its constituent object files. The likely source of 
 # the problem is that the environment is a bit too big, so a workaround could
 # 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
+
+
+# -----------------------------------------------------------------------------
+#		Compilation history for Patrick
+
+# Make the sources first, because that's what the compilation history needs
+$(HS_PROG) :: $(HS_SRCS)
 
 
 # -----------------------------------------------------------------------------
@@ -41,81 +41,67 @@ HS_PROG=hsc
 DIRS = \
   utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
   specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \
-  reader profiling parser
+  profiling parser usageSP cprAnalysis javaGen ghci
 
 
 ifeq ($(GhcWithNativeCodeGen),YES)
 DIRS += nativeGen
 else
 SRC_HC_OPTS += -DOMIT_NATIVE_CODEGEN
+ifeq ($(GhcWithIlx),YES)
+DIRS += ilxGen
+SRC_HC_OPTS += -DILX
+endif
 endif
 
 
-HS_SRCS = $(SRCS_UGNHS) \
-          $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs)) \
-	  rename/ParseIface.hs rename/ParseType.hs rename/ParseUnfolding.hs
+HS_SRCS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs))
 
-ifneq "$(Ghc2_0)" "YES"
-HS_SRCS += main/LoopHack.hc 
+ifneq "$(GhcWithHscBuiltViaC)" "YES"
+HS_SRCS += rename/ParseIface.hs parser/Parser.hs
 endif
 
-# NB: it's no good to include *.hs in the top-line wildcard, because the .hs files
-#     in parser/ may not have been created at that point.
-
-
 HCS      = $(patsubst %.lhs, %.hc, $(patsubst %.hs, %.hc, $(HS_SRCS)))
 
-#
-# When booting using a ghc-2.xx compiler, the loop breakers are actually written in
-# Haskell, source stubs just re-exporting info from the various .hi-boot files.
-# (Reason: we don't want to fiddle with the imports in the sources). We give them
-# the suffix .hs, since they're special and don't fall under the umbrella of $(HS_SRCS)
-# always (only when $(Ghc2_0) is equal to YES)
-ifeq "$(Ghc2_0)" "YES"
-MKDEPENDHS_SRCS = $(HS_SRCS)
-else
-LOOPS   = $(patsubst %.lhi, %.hi, $(wildcard */*.lhi))
+# ParseIface.hs ain't part of HS_SRCS when this is on..
+ifeq "$(GhcWithHscBuiltViaC)" "YES"
+HCS      += rename/ParseIface.hc parser/Parser.hc
 endif
- 
+
 HS_OBJS  = \
   $(patsubst %.hc, %.o, $(HCS)) \
-  parser/hsclink.o parser/hschooks.o libhsp.a
+  parser/hschooks.o
 
 
-DESTDIR         = $(INSTALL_LIBRARY_DIR_GHC)
-
-SRCS_UGN      = $(wildcard parser/*.ugn)
-SRCS_UGNC     = $(patsubst %.ugn, %.c, $(SRCS_UGN))
-SRCS_UGNH     = $(patsubst %.ugn, %.h, $(SRCS_UGN))
-SRCS_UGNHS    = $(patsubst parser/%.ugn, parser/U_%.hs, $(SRCS_UGN))
-SRCS_UGN_OBJS = $(patsubst %.c, %.o, $(SRCS_UGNC))
+DESTDIR       = $(INSTALL_LIBRARY_DIR_GHC)
 
 #
-# Add the generated C files to the C_SRCS, so as to let `depend'
-# generate correct dependencies for them.
+# Add misc .c helper code (used by the frontend.)
 #
-C_SRCS += $(SRCS_UGNC)
-
-LIBOBJS = \
-  $(SRCS_UGN_OBJS) parser/hslexer.o parser/hsparser.tab.o \
-  parser/id.o parser/infix.o parser/syntax.o parser/type2context.o \
-  parser/util.o
+C_SRCS += parser/hschooks.c
 
 #
+# Big Fudge to get around inherent problem that Makefile setup
+# has got with 'mkdependC'.
+# 
+SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
+
 # stuff you get for free in a source distribution
 # 
-SRC_DIST_FILES += rename/ParseIface.hs \
- rename/ParseType.hs rename/ParseUnfolding.hs \
- parser/U_tree.c parser/tree.h parser/tree.c \
- parser/hsparser.tab.c parser/hsparser.tab.h \
- parser/hslexer.c
+# SRC_DIST_FILES += rename/ParseIface.hs rename/Parser.hs
 
 # -----------------------------------------------------------------------------
 # 		Haskell compilations
 
-# Compiler to use for building hsc
 #
+# Compiler to use for building hsc, use the build tree
+# driver when booting.
+#
+ifneq "$(GhcWithHscBuiltViaC)" "YES"
 HC=$(WithGhcHc)
+else
+HC=$(GHC_INPLACE)
+endif
 
 # magic from GNU make manual to convert a list of values
 # into a colon-separated list
@@ -125,183 +111,204 @@ space:= $(empty) $(empty)
 SRC_HC_OPTS += \
   -cpp -fglasgow-exts -Rghc-timing \
   -I. -IcodeGen -InativeGen -Iparser \
-  -i$(subst $(space),:,$(DIRS))
-
-ifeq "$(Ghc2_0)" "NO"
-SRC_HC_OPTS += -fhaskell-1.3
-endif
-
-# -syslib ghc just needed for use of PackedString.hPutPS
+  -i$(subst $(space),:,$(DIRS)) 
 
 SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
 
-ifeq "$(Ghc2_0)" "NO"
-SRC_HC_OPTS += -fomit-derived-read -fomit-reexported-instances
-else
-SRC_HC_OPTS += -recomp
-endif
-
-SRC_HC_OPTS += $(GhcHcOpts)
+SRC_HC_OPTS += -recomp $(GhcHcOpts)
 
 # 	Special flags for particular modules
 #	The standard suffix rule for compiling a Haskell file
 #	adds these flags to the command line
 
-absCSyn/AbsCSyn_HC_OPTS 	= -fno-omit-reexported-instances
+# Was 6m with 2.10
+absCSyn/PprAbsC_HC_OPTS 	= -H10m
+
 basicTypes/IdInfo_HC_OPTS 	= -K2m
-coreSyn/AnnCoreSyn_HC_OPTS 	= -fno-omit-reexported-instances
+codeGen/CgCase_HC_OPTS		= -fno-prune-tydecls
 hsSyn/HsExpr_HC_OPTS 		= -K2m
-hsSyn/HsSyn_HC_OPTS 		= -fno-omit-reexported-instances
-main/Main_HC_OPTS 		= -fvia-C -DPROJECTVERSION=$(GhcProjectVersion)
-main/CmdLineOpts_HC_OPTS 	= -fvia-C
+main/Main_HC_OPTS 		= 
+main/Constants_HC_OPTS		= -DHscIfaceFileVersion=$(HscIfaceFileVersion)
+
+ifneq "$(GhcWithHscBuiltViaC)" "YES"
+ifeq "$(GhcReportCompiles)" "YES"
+main/Main_HC_OPTS 		+= -syslib misc -DREPORT_TO_MOTHERLODE
+endif
+endif
+
+main/CmdLineOpts_HC_OPTS 	=  -K6m
 nativeGen/PprMach_HC_OPTS 	= -K2m
-nativeGen/MachMisc_HC_OPTS 	= -K2m -fvia-C
+nativeGen/MachMisc_HC_OPTS 	= -K2m 
 nativeGen/MachCode_HC_OPTS 	= -H10m
-parser/UgenAll_HC_OPTS 		= -fvia-C '-\#include"hspincl.h"'
-parser/UgenUtil_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
-parser/U_constr_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
-parser/U_binding_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
-parser/U_pbinding_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
-parser/U_entidt_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
-parser/U_list_HC_OPTS 		= -fvia-C '-\#include"hspincl.h"'
-parser/U_literal_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
-parser/U_maybe_HC_OPTS 		= -fvia-C '-\#include"hspincl.h"'
-parser/U_either_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
-parser/U_qid_HC_OPTS 		= -fvia-C '-\#include"hspincl.h"'
-parser/U_tree_HC_OPTS 		= -H12m -fvia-C '-\#include"hspincl.h"'
-parser/U_ttype_HC_OPTS 		= -fvia-C '-\#include"hspincl.h"'
+
+# Avoids Bug in 3.02, it seems
+usageSP/UsageSPInf_HC_OPTS	= -Onot
+
 prelude/PrimOp_HC_OPTS 		= -H12m -K3m
-reader/Lex_HC_OPTS		= -K2m -H16m -fvia-C
-reader/ReadPrefix_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
-rename/ParseIface_HC_OPTS 	+= -Onot -H16m
-rename/ParseType_HC_OPTS 	+= -Onot -H16m
-rename/ParseUnfolding_HC_OPTS 	+= -Onot -H30m
-ifeq "$(Ghc2_0)" "YES"
-rename/ParseIface_HC_OPTS       += -fno-warn-incomplete-patterns
-rename/ParseType_HC_OPTS        += -fno-warn-incomplete-patterns
-rename/ParseUnfolding_HC_OPTS   += -fno-warn-incomplete-patterns
-endif
+prelude/PrelRules_HC_OPTS	= -fvia-C
+
+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
+
+parser/Parser_HC_OPTS 		+= -Onot -H80m -optCrts-M80m -K2m -fno-warn-incomplete-patterns
 
 ifeq "$(TARGETPLATFORM)" "hppa1.1-hp-hpux9"
-rename/RnMonad_HC_OPTS 		= -fvia-C -O2 -O2-for-C
-else
-ifeq "$(Ghc2_0)" "NO"
-rename/RnMonad_HC_OPTS 		= -fvia-C
-endif
+rename/RnMonad_HC_OPTS 		=  -O2 -O2-for-C
 endif
-rename/RnEnv_HC_OPTS 		= -fvia-C
+
+rename/RnEnv_HC_OPTS 		= 
 rename/RnSource_HC_OPTS		= -H12m
-rename/RnIfaces_HC_OPTS		= -H8m -fvia-C
+rename/RnIfaces_HC_OPTS		= -H8m 
+rename/RnExpr_HC_OPTS		= -H10m
 rename/RnNames_HC_OPTS		= -H12m
-rename/RnMonad_HC_OPTS		= -fvia-C
-# Urk!  Really big heap for ParseUnfolding
-#rename/ParseUnfolding_HC_OPTS	= -H45m		
+rename/RnMonad_HC_OPTS		= 
 specialise/Specialise_HC_OPTS 	= -Onot -H12m
-stgSyn/StgSyn_HC_OPTS 		= -fno-omit-reexported-instances
+simplCore/Simplify_HC_OPTS	= -H15m	
+simplCore/OccurAnal_HC_OPTS	= -H10m
 typecheck/TcGenDeriv_HC_OPTS	= -H10m
-typecheck/TcHsSyn_HC_OPTS	= -H10m
-typecheck/TcExpr_HC_OPTS	= -H10m
+
+# tmp, -- SDM
+specialise/Specialise_HC_OPTS 	+= -fno-prune-tydecls
+hsSyn/HsBasic_HC_OPTS		+= -fno-prune-tydecls
+simplCore/SimplMonad_HC_OPTS	+= -fno-prune-tydecls
+absCSyn/AbsCSyn_HC_OPTS		+= -fno-prune-tydecls
+absCSyn/AbsCUtils_HC_OPTS	+= -fno-prune-tydecls
+codeGen/CgBindery_HC_OPTS	+= -fno-prune-tydecls
+codeGen/CgLetNoEscape_HC_OPTS	+= -fno-prune-tydecls
+codeGen/CgExpr_HC_OPTS		+= -fno-prune-tydecls
+nativeGen/AbsCStixGen_HC_OPTS	+= -fno-prune-tydecls
+
+# Was 10m for 2.10
+typecheck/TcHsSyn_HC_OPTS	= -H15m	
+
+
+# Was 10m for 2.10
+typecheck/TcExpr_HC_OPTS	= -H15m
+typecheck/TcBinds_HC_OPTS       = -H10m
+
 typecheck/TcEnv_HC_OPTS		= -H10m
-ifeq "$(Ghc2_0)" "NO"
-typecheck/TcMonad_HC_OPTS	= -fvia-C	
-endif
 utils/Argv_HC_OPTS 		= -fvia-C
-utils/SST_HC_OPTS 		= -fvia-C
-utils/PrimPacked_HC_OPTS	= -fvia-C -monly-3-regs
-utils/FastString_HC_OPTS	= -fvia-C -monly-3-regs
-utils/StringBuffer_HC_OPTS	= -fvia-C
-utils/Digraph_HC_OPTS		= -fglasgow-exts -fvia-C
-
-# optimiser misbehaving in 0.29, occurrence analyser fails to terminate when
-# compiling lib/required/Time.lhs
-ifeq "$(Ghc2_0)" "NO"
-simplCore/OccurAnal_HC_OPTS	= -Onot
+utils/SST_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	= 
 endif
 
+# flags for PrimPacked:
+#
+# -monly-3-regs 
+#	because it contains a 'ccall strlen', which gets inlined by
+# 	gcc, causing a lack of registers.
+#
+# -optC-funfolding-interface-threshold7
+#	To stop the definition of 'strLength', which calls strlen, getting
+#	into the interface file and spreading the -monly-3-regs virus.
+#	We need -optC here because the driver before 3.02 didn't understand
+#	the -funfolding flags.
+
+utils/PrimPacked_HC_OPTS	= -fvia-C -monly-3-regs -optC-funfolding-interface-threshold7
+
+# Strictness analyser misbehaving in 2.10, fails to terminate on
+# UpdAnal.lhs due to weird recursive datatype.  Bug was exposed by a
+# separate bugfix to the fixpoint finder.
+simplStg/UpdAnal_HC_OPTS	= -fno-strictness
+
+stgSyn/StgInterp_HC_OPTS	= -fvia-C
+
 # ----------------------------------------------------------------------------
 #		C compilations
 
-SRC_C_OPTS     += -O -Iparser -I. -IcodeGen
+SRC_C_OPTS     += -O -I. -IcodeGen
 
 
 # ----------------------------------------------------------------------------
-#		Parsers
+#		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 < $< > $@
 
-# Main parser uses Yacc/Bison
-SRC_YACC_OPTS  += -d -v
 
-#
-# Want to keep the intermediate (included in src distribs).
-#
-.PRECIOUS: %.tab.c %.tab.h parser/hslexer.c
+
+# ----------------------------------------------------------------------------
+#		Parsers/lexers
 
 parser/hschooks.o : parser/hschooks.c
 	@$(RM) $@
-	$(HC) -c -o $@ $(HCFLAGS) parser/hschooks.c
+	$(HC) -c -o $@ $(HC_OPTS) parser/hschooks.c
 
 
 # Interface-file parser uses Happy
-SRC_HAPPY_OPTS += +RTS -K2m -H10m -RTS
-
-ifeq ($(Ghc2_0),NO)
-SRC_HAPPY_OPTS+= -1.2
-endif
+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
 
-rename/ParseType.hs : rename/ParseType.y
-	@$(RM) rename/ParseType.hs rename/ParseType.hinfo
-	$(HAPPY) $(HAPPY_OPTS) -g rename/ParseType.y
-	@chmod 444 rename/ParseType.hs
-
-rename/ParseUnfolding.hs : rename/ParseUnfolding.y
-	@$(RM) rename/ParseUnfolding.hs rename/ParseUnfolding.hinfo
-	$(HAPPY) $(HAPPY_OPTS) -g rename/ParseUnfolding.y
-	@chmod 444 rename/ParseUnfolding.hs
-
-#----------------------------------------------------------------------
-#
-# Building the stand-alone parser
-#
-all :: hsp
-
-hsp: parser/printtree.o parser/main.o libhsp.a 
-	$(CC) -o $@ $(CC_OPTS) $^
-
-CLEAN_FILES += hsp
-#-----------------------------------------------------------------------------
-# 		Interface files
-
-# LoopHack.lhc is an SLPJ addition to fix a profiling problem.  See comments
-# inside it. (compilation is handled by the suffix rules).
-
-#
-# Building the loop breakers from .lhi (0.2x) or .hi-boot (2.xx) files
-#
-ifeq "$(Ghc2_0)" "NO"
-hi-boot :: $(LOOPS)
-
-%.hi : %.lhi
-	$(RM) $@
-	$(UNLIT) $<  $@ || ( $(RM) $@ && exit 1 )
-	@chmod 444 $@
-
-boot :: hi-boot
-else
-# hi-boot not needed when using 2.04+ as HC, defining it here
-# to be consistent across setting of Ghc2_0
-hi-boot :
-	@echo "Done."
-endif
+parser/Parser.hs : parser/Parser.y
+	@$(RM) parser/Parser.hs parser/ParseIface.hinfo
+	$(HAPPY) $(HAPPY_OPTS) parser/Parser.y
+	@chmod 444 parser/Parser.hs
 
 #-----------------------------------------------------------------------------
 # 		Linking
 
 SRC_LD_OPTS += -no-link-chk
 
+ifneq "$(GhcWithHscBuiltViaC)" "YES"
+ifeq "$(GhcReportCompiles)" "YES"
+SRC_LD_OPTS += -syslib misc -syslib exts
+endif
+endif
+
 #-----------------------------------------------------------------------------
 # 		install
 
@@ -309,51 +316,29 @@ SRC_LD_OPTS += -no-link-chk
 # but put it together with the libraries.
 # Also don't want any interface files intstalled
 
-INSTALL_LIBEXECS += hsc hsp
+INSTALL_LIBEXECS += hsc
 
 #-----------------------------------------------------------------------------
 # 		depend
 
-# If we're using a 1.2 compiler to compile the compiler, need the old mkdepend stuff
-#
-# ToDo: define sep MKDEPENDHS_1.2 variable so that it can be readily overridden
-# in a build.mk file.
-#
-ifeq ($(Ghc2_0),NO)
-MKDEPENDHS      = $(MKDEPENDHS_1_2)
-endif
-
 #
 # Before doing `make depend', need to build all derived Haskell source files
 #
-depend :: $(LOOPS) $(SRCS_UGNHS) rename/ParseIface.hs rename/ParseUnfolding.hs rename/ParseType.hs
+depend :: $(LOOPS)
 
-
-ifeq "$(GhcWithHscBuiltViaC)" "YES"
-ifeq "$(Ghc2_0)" "NO"
-SRC_MKDEPENDHS_OPTS += -o hc
-else
-SRC_MKDEPENDHS_OPTS += -optdep-o -optdephc
+ifneq "$(GhcWithHscBuiltViaC)" "YES"
+depend :: rename/ParseIface.hs
 endif
-# When booting from .hc, (hackily) remove the suffix rule for 
-# .l?hs -> .o, so that the .hc -> .o is used instead.
-%.$(way_)o : %.lhs
-%.$(way_)o : %.hs
-else
-  SRCS_MKDEPENDHS = $(SRCS_HC) # should add $(LOOPS) ?
-endif
-
 
 #-----------------------------------------------------------------------------
 # 		clean
 
-CLEAN_FILES += $(wildcard */*.$(way_)o */*.$(way_)hi) \
-               $(SRCS_UGNC) $(SRCS_UGNH) \
-               $(SRCS_UGNHS)\
-	       parser/hslexer.c parser/hsparser.tab.h parser/hsparser.tab.c
+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)
+MAINTAINER_CLEAN_FILES += $(wildcard */*.hc) \
+	parser/Parser.hs rename/ParseIface.hs
 
 
 #-----------------------------------------------------------------------------
@@ -368,27 +353,5 @@ TAGS_C_SRCS=$(strip $(foreach f,$(foreach dir,$(DIRS),$(wildcard $(dir)/*.c)),$(
 
 include $(TOP)/mk/target.mk
 
+parser/%.o : parser/%.c
 
-#
-# Special extra dependencies for yukky ugen stuff
-#
-
-parser/%.o : parser/%.c $(SRCS_UGNH)
-parser/hslexer.o : parser/hslexer.c parser/hsparser.tab.h
-
-parser/hspincl.h : $(SRCS_UGNH)
-parser/UgenAll.o : parser/hspincl.h
-parser/UgenUtil.o : parser/hspincl.h
-parser/U_constr.o : parser/hspincl.h
-parser/U_binding.o : parser/hspincl.h
-parser/U_pbinding.o : parser/hspincl.h
-parser/U_entidt.o : parser/hspincl.h
-parser/U_list.o : parser/hspincl.h
-parser/U_literal.o : parser/hspincl.h
-parser/U_maybe.o : parser/hspincl.h
-parser/U_either.o : parser/hspincl.h
-parser/U_qid.o : parser/hspincl.h
-parser/U_tree.o : parser/hspincl.h
-parser/U_ttype.o : parser/hspincl.h
-parser/printtree.o : parser/hspincl.h
-reader/ReadPrefix.o : parser/hspincl.h