X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=e57f7380321952b85458ba354870cfa077c431fc;hb=7887b9e7f59b24c276eeedb74df6ad547c99ec01;hp=945354d3106d64756afac504672c85c8a8e480b4;hpb=308ebd84adf39e26dfdfd2acccdc1686f1834a18;p=ghc-base.git

diff --git a/Makefile b/Makefile
index 945354d..e57f738 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.18 2002/02/17 20:05:35 panne Exp $
+# $Id: Makefile,v 1.24 2002/04/24 16:13:26 simonmar Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -34,8 +34,10 @@ ALL_DIRS = \
 	Text \
 	Text/Html \
 	Text/PrettyPrint \
+	Text/ParserCombinators \
 	Text/Regex \
-	Text/Show
+	Text/Show \
+	Text/Read
 
 PACKAGE = base
 
@@ -52,9 +54,7 @@ endif
 # Per-module flags
 
 # ESSENTIAL, for getting reasonable performance from the I/O library:
-GHC/IOBase_HC_OPTS   		= -funbox-strict-fields 
-
-Data/Array/Storable_HC_OPTS 	= -funbox-strict-fields
+SRC_HC_OPTS += -funbox-strict-fields
 
 # -----------------------------------------------------------------------------
 # PrimOpWrappers
@@ -67,23 +67,6 @@ 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)
-INSTALL_DATAS_WITH_DIRS += GHC/Prim.$(way_)hi
-
-lib  : $(ALL_PRIMS)
-
-boot :: $(ALL_PRIMS)
-
-CLEAN_FILES += $(ALL_PRIMS)
-
-SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional
-
 #-----------------------------------------------------------------------------
 # 	Building the library for GHCi
 #
@@ -94,21 +77,53 @@ SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
 # Turn off standard rule which creates HSbase.o from LIBOBJS.
-DONT_WANT_BASE_GHCI_LIB_RULE=YES
+DONT_WANT_STD_GHCI_LIB_RULE=YES
 
 GHCI_LIBOBJS = $(HS_OBJS)
 
-HSbase.o : $(GHCI_LIBOBJS)
-	$(LD) -r $(LD_X) -o HSbase1.o $(filter     GHC/%, $(GHCI_LIBOBJS))
-	$(LD) -r $(LD_X) -o HSbase2.o $(filter-out GHC/%, $(GHCI_LIBOBJS))
-	@touch HSbase.o
-
 INSTALL_LIBS += HSbase1.o HSbase2.o
 
 endif # TARGETPLATFORM = i386-unknown-mingw32
 
 
 # -----------------------------------------------------------------------------
+# Doc building with Haddock
+
+EXCLUDED_HADDOCK_SRCS = \
+	GHC/Err.lhs \
+	Data/Generics.hs \
+	GHC/PArr.hs \
+	Control/Monad/Error.hs \
+	Control/Monad/Reader.hs \
+	Control/Monad/State.hs \
+	Control/Monad/Writer.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) -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
+
+# -----------------------------------------------------------------------------
 
 include $(TOP)/mk/target.mk
 
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+HSbase.o : $(GHCI_LIBOBJS)
+	$(LD) -r $(LD_X) -o HSbase1.o $(filter     GHC/%, $(GHCI_LIBOBJS))
+	$(LD) -r $(LD_X) -o HSbase2.o $(filter-out GHC/%, $(GHCI_LIBOBJS))
+	@touch HSbase.o
+endif # TARGETPLATFORM = i386-unknown-mingw32
+