X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=ddc4032983e00fd51adc8ffef0f40ada9d3669a0;hb=99073d876ea762016683fb0b22b9d343ff864eb4;hp=21bd8a122db74438b9f93c92e326accb2ebfc2d2;hpb=506fa77d392191e46c12b2c19387ff5b0888f6a2;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 21bd8a1..ddc4032 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.58 1999/05/18 15:03:34 simonpj Exp $
+# $Id: Makefile,v 1.95 2000/10/12 12:31:11 sewardj Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -8,29 +8,70 @@ 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
 
+# -----------------------------------------------------------------------------
+# Create compiler configuration
+
+CONFIG_HS = main/Config.hs
+boot :: $(CONFIG_HS)
+
+$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
+	@$(RM) -f $(CONFIG_HS)
+	@echo -n "Creating $(CONFIG_HS) ... "
+	@echo "module Config where" >>$(CONFIG_HS)
+	@echo "cProjectName          = \"$(ProjectName)\"" >> $(CONFIG_HS)
+	@echo "cProjectVersion       = \"$(ProjectVersion)\"" >> $(CONFIG_HS)
+	@echo "cProjectVersionInt    = \"$(ProjectVersionInt)\"" >> $(CONFIG_HS)
+	@echo "cHscIfaceFileVersion  = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
+	@echo "cHOSTPLATFORM         = \"$(HOSTPLATFORM)\"" >> $(CONFIG_HS)
+	@echo "cTARGETPLATFORM       = \"$(TARGETPLATFORM)\"" >> $(CONFIG_HS)
+	@echo "cCURRENT_DIR          = \"$(CURRENT_DIR)\"" >> $(CONFIG_HS)
+	@echo "cGHC_LIB_DIR          = \"$(GHC_LIB_DIR)\"" >> $(CONFIG_HS)
+	@echo "cGHC_RUNTIME_DIR      = \"$(GHC_RUNTIME_DIR)\"" >> $(CONFIG_HS)
+	@echo "cGHC_UTILS_DIR        = \"$(GHC_UTILS_DIR)\"" >> $(CONFIG_HS)
+	@echo "cGHC_INCLUDE_DIR      = \"$(GHC_INCLUDE_DIR)\"" >> $(CONFIG_HS)
+	@echo "cGHC_DRIVER_DIR       = \"$(GHC_DRIVER_DIR)\"" >> $(CONFIG_HS)
+	@echo "cGCC                  = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS)
+	@echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS)
+	@echo "cLeadingUnderscore    = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS)
+	@echo "cGHC_UNLIT            = \"$(GHC_UNLIT)\"" >> $(CONFIG_HS)
+	@echo "cGHC_HSC              = \"$(GHC_HSC)\"" >> $(CONFIG_HS)
+	@echo "cGHC_MANGLER          = \"$(GHC_MANGLER)\"" >> $(CONFIG_HS)
+	@echo "cGHC_SPLIT            = \"$(GHC_SPLIT)\"" >> $(CONFIG_HS)
+	@echo "cGHC_STATS            = \"$(GHC_STATS)\"" >> $(CONFIG_HS)
+	@echo "cGHC_SYSMAN           = \"$(GHC_SYSMAN)\"" >> $(CONFIG_HS)
+	@echo "cEnableWin32DLLs      = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS)
+	@echo "cCP                   = \"$(CP)\"" >> $(CONFIG_HS)
+	@echo "cRM                   = \"$(RM)\"" >> $(CONFIG_HS)
+	@echo "cCONTEXT_DIFF         = \"$(CONTEXT_DIFF)\"" >> $(CONFIG_HS)
+	@echo "cHaveLibGmp           = \"$(HaveLibGmp)\"" >> $(CONFIG_HS)
+	@echo "cGhcWithRegisterised  = \"$(GhcWithRegisterised)\"" >> $(CONFIG_HS)
+	@echo "cUSER_WAY_NAMES       = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS)
+	@echo "cUSER_WAY_OPTS        = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS)
+	@echo "clibdir               = \"$(libdir)\"" >> $(CONFIG_HS)
+	@echo "clibexecdir           = \"$(libexecdir)\"" >> $(CONFIG_HS)
+	@echo "cdatadir              = \"$(datadir)\"" >> $(CONFIG_HS)
+	@echo "cbindir               = \"$(bindir)\"" >> $(CONFIG_HS)
+	@echo "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS)
+	@echo "cFPTOOLS_TOP_ABS      = \"$(FPTOOLS_TOP_ABS)\"" >> $(CONFIG_HS)
+	@echo "cRAWCPP               = \"$(RAWCPP)\"" >> $(CONFIG_HS)
+	@echo done.
+
+CLEAN_FILES += $(CONFIG_HS)
 
 # -----------------------------------------------------------------------------
 #		Compilation history for Patrick
@@ -49,57 +90,44 @@ $(HS_PROG) :: $(HS_SRCS)
 DIRS = \
   utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
   specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \
-  reader profiling parser usageSP cprAnalysis
+  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))
+HS_SRCS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs) $(wildcard $(dir)/*.hs))
 
 ifneq "$(GhcWithHscBuiltViaC)" "YES"
-HS_SRCS += rename/ParseIface.hs
+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)))
 
 # ParseIface.hs ain't part of HS_SRCS when this is on..
 ifeq "$(GhcWithHscBuiltViaC)" "YES"
-HCS      += rename/ParseIface.hc
+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))
-
-#
-# Add the generated C files to the C_SRCS, so as to let `depend'
-# generate correct dependencies for them.
-#
-C_SRCS += $(SRCS_UGNC)
 #
 # Add misc .c helper code (used by the frontend.)
 #
-C_SRCS += parser/ctypes.c parser/hschooks.c parser/hsclink.c \
-          parser/id.c parser/infix.c parser/main.c parser/printtree.c \
-	  parser/syntax.c parser/type2context.c parser/util.c
+C_SRCS += parser/hschooks.c
 
 #
 # Big Fudge to get around inherent problem that Makefile setup
@@ -107,17 +135,9 @@ C_SRCS += parser/ctypes.c parser/hschooks.c parser/hsclink.c \
 # 
 SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
 
-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 parser/ctypes.o
-
 # stuff you get for free in a source distribution
 # 
-# SRC_DIST_FILES += rename/ParseIface.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
@@ -129,7 +149,7 @@ LIBOBJS = \
 ifneq "$(GhcWithHscBuiltViaC)" "YES"
 HC=$(WithGhcHc)
 else
-HC=$(GHC_DRIVER_DIR)/ghc
+HC=$(GHC_INPLACE)
 endif
 
 # magic from GNU make manual to convert a list of values
@@ -138,9 +158,20 @@ empty:=
 space:= $(empty) $(empty)
 
 SRC_HC_OPTS += \
-  -cpp -fglasgow-exts -Rghc-timing \
-  -I. -IcodeGen -InativeGen -Iparser \
-  -i$(subst $(space),:,$(DIRS))
+  -cpp -fglasgow-exts \
+  -Rghc-timing -I. -IcodeGen -InativeGen -Iparser \
+  -i$(subst $(space),:,$(DIRS)) 
+
+ghc_407_at_least = $(shell expr "$(GhcMinVersion)" \>= 7)
+ifeq "$(ghc_407_at_least)" "1"
+ifneq "$(mingw32_TARGET_OS)" "1"
+SRC_HC_OPTS += -package concurrent -package posix -package text
+else
+SRC_HC_OPTS += -package concurrent -package text
+endif
+else
+SRC_HC_OPTS += -syslib concurrent -syslib posix -syslib misc
+endif
 
 SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
 
@@ -156,7 +187,7 @@ absCSyn/PprAbsC_HC_OPTS 	= -H10m
 basicTypes/IdInfo_HC_OPTS 	= -K2m
 codeGen/CgCase_HC_OPTS		= -fno-prune-tydecls
 hsSyn/HsExpr_HC_OPTS 		= -K2m
-main/Main_HC_OPTS 		= -fvia-C
+main/Main_HC_OPTS 		= 
 main/Constants_HC_OPTS		= -DHscIfaceFileVersion=$(HscIfaceFileVersion)
 
 ifneq "$(GhcWithHscBuiltViaC)" "YES"
@@ -165,56 +196,49 @@ main/Main_HC_OPTS 		+= -syslib misc -DREPORT_TO_MOTHERLODE
 endif
 endif
 
-main/CmdLineOpts_HC_OPTS 	= -fvia-C -K6m
+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_binding_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
-parser/U_constr_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
-parser/U_either_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
-parser/U_entidt_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"'
-parser/U_gdexp_HC_OPTS 		= -fvia-C '-\#include"hspincl.h"'
-parser/U_grhsb_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_match_HC_OPTS 		= -fvia-C '-\#include"hspincl.h"'
-parser/U_maybe_HC_OPTS 		= -fvia-C '-\#include"hspincl.h"'
-parser/U_qid_HC_OPTS 		= -fvia-C '-\#include"hspincl.h"'
-parser/U_rulevar_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
+prelude/PrelRules_HC_OPTS	= -fvia-C
 
-# Heap was 6m with 2.10
-reader/ReadPrefix_HC_OPTS 	= -fvia-C '-\#include"hspincl.h"' -H10m
+parser/Lex_HC_OPTS		= -fvia-C -K2m -H16m 
+parser/Ctype_HC_OPTS		= -K2m -fvia-C
 
-rename/ParseIface_HC_OPTS 	+= -Onot -H45m -dcore-lint -fno-warn-incomplete-patterns
-rename/ParseIface_HAPPY_OPTS    += -g
+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
+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
+rename/RnMonad_HC_OPTS		= 
 specialise/Specialise_HC_OPTS 	= -Onot -H12m
 simplCore/Simplify_HC_OPTS	= -H15m	
+simplCore/OccurAnal_HC_OPTS	= -H10m
 typecheck/TcGenDeriv_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	
@@ -226,15 +250,17 @@ typecheck/TcBinds_HC_OPTS       = -H10m
 
 typecheck/TcEnv_HC_OPTS		= -H10m
 utils/Argv_HC_OPTS 		= -fvia-C
-utils/SST_HC_OPTS 		= -fvia-C
-utils/FastString_HC_OPTS	= -fvia-C
+utils/SST_HC_OPTS 		= 
 utils/StringBuffer_HC_OPTS	= -fvia-C -fno-prune-tydecls
-utils/Digraph_HC_OPTS		= -fglasgow-exts -fvia-C
-utils/DirUtils_HC_OPTS 		= -fvia-C
+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	= -fvia-C
+basicTypes/Unique_HC_OPTS	= 
 endif
 
 # flags for PrimPacked:
@@ -243,66 +269,99 @@ endif
 #	because it contains a 'ccall strlen', which gets inlined by
 # 	gcc, causing a lack of registers.
 #
-# -optC-funfolding-interface-threshold10
+# -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-threshold10
+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/lexers
+#		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
-# Suppress the generation of a default rule
-SRC_FLEX_OPTS += -s
 
-#
-# 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 $@ -I$(GHC_INCLUDE_DIR) $(HC_OPTS) parser/hschooks.c
+	$(HC) -c -o $@ $(HC_OPTS) parser/hschooks.c
 
 
 # Interface-file parser uses Happy
-SRC_HAPPY_OPTS += +RTS -K2m -H10m -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
 
-#----------------------------------------------------------------------
-#
-# Building the stand-alone parser
-#
-all :: hsp
-
-hsp: parser/printtree.o parser/main.o libhsp.a 
-	$(CC) -o $@ $(CC_OPTS) $^
-
-CLEAN_FILES += hsp
+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
+SRC_LD_OPTS += -no-link-chk -ldl
 
 ifneq "$(GhcWithHscBuiltViaC)" "YES"
 ifeq "$(GhcReportCompiles)" "YES"
@@ -317,7 +376,7 @@ endif
 # but put it together with the libraries.
 # Also don't want any interface files intstalled
 
-INSTALL_LIBEXECS += hsc hsp
+INSTALL_LIBEXECS += hsc
 
 #-----------------------------------------------------------------------------
 # 		depend
@@ -325,7 +384,7 @@ INSTALL_LIBEXECS += hsc hsp
 #
 # Before doing `make depend', need to build all derived Haskell source files
 #
-depend :: $(LOOPS) $(SRCS_UGNHS)
+depend :: $(LOOPS)
 
 ifneq "$(GhcWithHscBuiltViaC)" "YES"
 depend :: rename/ParseIface.hs
@@ -334,13 +393,12 @@ 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
 
 
 #-----------------------------------------------------------------------------
@@ -355,27 +413,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