[project @ 2002-02-06 11:51:12 by simonmar]

[haskell-directory.git] / Makefile

diff --git a/Makefile b/Makefile
index 1240ea8..f173dbc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.7 2001/12/21 15:07:20 simonmar Exp $
+# $Id: Makefile,v 1.10 2002/02/06 11:51:12 simonmar Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -31,11 +31,12 @@ ALL_DIRS = \
        System/Mem \
        System/IO \
        Text \
+       Text/Html \
        Text/PrettyPrint \
        Text/Regex \
        Text/Show
 
-PKG=core
+PKG = base
 
 # -----------------------------------------------------------------------------
 # PrimOpWrappers
@@ -44,25 +45,23 @@ GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
        rm -f $@
        $(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
 
-boot :: GHC/PrimOpWrappers.hs
+boot :: GHC/PrimopWrappers.hs
 
 CLEAN_FILES += GHC/PrimopWrappers.hs
 
 # -----------------------------------------------------------------------------
 # GHC/Prim.hi-boot
 
-#GHC/Prim.$(way_)hi    : GHC/Prim.hi-boot
-#      cp $< $@
-#
-#ALL_PRIMS = GHC/Prim.hi $(foreach way, $(WAYS), GHC/Prim.$(way)_hi)
-#
-#lib  : $(ALL_PRIMS)
-#
-#boot :: $(ALL_PRIMS)
-#
-#CLEAN_FILES += $(ALL_PRIMS)
-
-lib : GHC/Prim.hi-boot
+GHC/Prim.$(way_)hi     : GHC/Prim.hi-boot
+       cp $< $@
+
+ALL_PRIMS = GHC/Prim.hi $(foreach way, $(WAYS), GHC/Prim.$(way)_hi)
+
+lib  : $(ALL_PRIMS)
+
+boot :: $(ALL_PRIMS)
+
+CLEAN_FILES += $(ALL_PRIMS)
 
 SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional