X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=e57f7380321952b85458ba354870cfa077c431fc;hb=d907c82167d095f5ac0cda0976fff3d403376cbc;hp=f173dbce7afbf2fd48ece7dfa9a23ea4fc687435;hpb=6679033059077ab7ceb19540a8801d812e939e4e;p=ghc-base.git

diff --git a/Makefile b/Makefile
index f173dbc..e57f738 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.10 2002/02/06 11:51:12 simonmar Exp $
+# $Id: Makefile,v 1.24 2002/04/24 16:13:26 simonmar Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -28,15 +28,33 @@ ALL_DIRS = \
 	Network \
 	NHC \
 	System \
+	System/Console \
 	System/Mem \
 	System/IO \
 	Text \
 	Text/Html \
 	Text/PrettyPrint \
+	Text/ParserCombinators \
 	Text/Regex \
-	Text/Show
+	Text/Show \
+	Text/Read
 
-PKG = base
+PACKAGE = base
+
+SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude
+SRC_HSC2HS_OPTS += -Iinclude
+
+# Make sure we can get hold of regex.h
+ifneq "$(HavePosixRegex)" "YES"
+SRC_HC_OPTS     += -Icbits/regex
+SRC_HSC2HS_OPTS += -Icbits/regex
+endif
+
+# -----------------------------------------------------------------------------
+# Per-module flags
+
+# ESSENTIAL, for getting reasonable performance from the I/O library:
+SRC_HC_OPTS += -funbox-strict-fields
 
 # -----------------------------------------------------------------------------
 # PrimOpWrappers
@@ -49,23 +67,63 @@ boot :: GHC/PrimopWrappers.hs
 
 CLEAN_FILES += GHC/PrimopWrappers.hs
 
+#-----------------------------------------------------------------------------
+# 	Building the library for GHCi
+#
+# The procedure differs from that in fptools/mk/target.mk in one way:
+#  (*) on Win32 we must split it into two, because a single .o file can't
+#      have more than 65536 relocations in it.
+
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+
+# Turn off standard rule which creates HSbase.o from LIBOBJS.
+DONT_WANT_STD_GHCI_LIB_RULE=YES
+
+GHCI_LIBOBJS = $(HS_OBJS)
+
+INSTALL_LIBS += HSbase1.o HSbase2.o
+
+endif # TARGETPLATFORM = i386-unknown-mingw32
+
+
 # -----------------------------------------------------------------------------
-# GHC/Prim.hi-boot
+# 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
 
-GHC/Prim.$(way_)hi	: GHC/Prim.hi-boot
-	cp $< $@
+HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
 
-ALL_PRIMS = GHC/Prim.hi $(foreach way, $(WAYS), GHC/Prim.$(way)_hi)
+HADDOCK = $(FPTOOLS_TOP)/haddock/src/haddock-inplace
 
-lib  : $(ALL_PRIMS)
+# Urgh, hack needed to ensure that the value of HS_SRCS is computed in time for
+# the docs rule below.
+PRE_SRCS := $(ALL_SRCS)
 
-boot :: $(ALL_PRIMS)
+.PHONY: docs
+haddock-docs : $(HS_PPS)
+	$(HADDOCK) -t "Haskell Core Libraries" -h -s "." $(HS_PPS)
 
-CLEAN_FILES += $(ALL_PRIMS)
+%.raw-hs : %.lhs
+	$(GHC_INPLACE) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
 
-SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional
+%.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
+