[project @ 2003-07-08 16:04:54 by panne]

[haskell-directory.git] / Makefile

diff --git a/Makefile b/Makefile
index c2b9108..72446d9 100644 (file)
--- 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.43 2003/05/30 09:19:39 simonpj Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -15,22 +15,19 @@ ALL_DIRS = \
        Control/Monad/ST \
        Data \
        Data/Array \
-       Database \
+       Data/Array/IO \
+       Data/STRef \
        Debug \
        Debug/QuickCheck \
-       FileFormat \
        Foreign \
        Foreign/C \
        Foreign/Marshal \
        GHC \
-       Hugs \
-       Language \
-       Network \
-       NHC \
        System \
        System/Console \
        System/Mem \
        System/IO \
+       System/Posix \
        Text \
        Text/Html \
        Text/PrettyPrint \
@@ -42,8 +39,8 @@ ALL_DIRS = \
 
 PACKAGE = base
 
-SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude
-SRC_HSC2HS_OPTS += -Iinclude
+SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude -\#include HsBase.h
+SRC_HSC2HS_OPTS += -Iinclude -I$(FPTOOLS_TOP)/ghc/includes
 
 # Make sure we can get hold of regex.h
 ifneq "$(HavePosixRegex)" "YES"
@@ -61,7 +58,7 @@ SRC_HC_OPTS += -funbox-strict-fields
 # PrimOpWrappers
 
 GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
-       rm -f $@
+       @$(RM) $@
        $(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
 
 boot :: GHC/PrimopWrappers.hs
@@ -92,7 +89,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
 
@@ -101,26 +98,11 @@ endif # OBJECT_FILEFORMAT = PEi
 # Doc building with Haddock
 
 EXCLUDED_HADDOCK_SRCS = \
-       Data/Generics.hs \
+       GHC/PrimopWrappers.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
 
 # -----------------------------------------------------------------------------