X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=8cc4bf39f540a3298b4cc0214d227c93e43aaa8b;hb=9a53a070bb647bd7796596e27a6348ae3ba6eed7;hp=c2b9108bf113b3d22f0a775acdf85a9ab7be6385;hpb=5ac77b655828b1c52af10345a0ebb0cf0c3d4507;p=ghc-base.git

diff --git a/Makefile b/Makefile
index c2b9108..8cc4bf3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.30 2002/06/04 19:12:53 sof Exp $
+# $Id: Makefile,v 1.36 2002/07/02 13:13:36 simonmar Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -15,6 +15,7 @@ ALL_DIRS = \
 	Control/Monad/ST \
 	Data \
 	Data/Array \
+	Data/STRef \
 	Database \
 	Debug \
 	Debug/QuickCheck \
@@ -92,7 +93,7 @@ DONT_WANT_STD_GHCI_LIB_RULE=YES
 
 GHCI_LIBOBJS = $(HS_OBJS)
 
-INSTALL_LIBS += HSbase1.o HSbase2.o
+INSTALL_LIBS += HSbase1.o HSbase2.o HSbase3.o
 
 endif # OBJECT_FILEFORMAT = PEi
 
@@ -104,23 +105,8 @@ EXCLUDED_HADDOCK_SRCS = \
 	Data/Generics.hs \
 	GHC/PArr.hs
 
-HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
-
-HADDOCK = $(FPTOOLS_TOP)/haddock/src/haddock-inplace
-
-# Urgh, hack needed to ensure that the value of HS_SRCS is computed in time for
-# the docs rule below.
-PRE_SRCS := $(ALL_SRCS)
-
-.PHONY: docs
-haddock-docs : $(HS_PPS)
-	$(HADDOCK) -t "Haskell Core Libraries" -h -s "." $(HS_PPS)
-
-%.raw-hs : %.lhs
-	$(GHC_INPLACE) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
-
-%.raw-hs : %.hs
-	$(GHC_INPLACE) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
+SRC_HADDOCK_OPTS += -t "Haskell Core Libraries (base package)" \
+	--no-implicit-prelude -p prologue.txt
 
 # -----------------------------------------------------------------------------