X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=5157ef13ea4a9b8207d2634fa9c8cedf87009d94;hb=792c0b584d78fdab6834553b79f9b5d445ae80e6;hp=1240ea88d65165edf43e9d477a8b6438525a678c;hpb=260e7f2ed9a43c6ecf5a556d77817f39ed2893ab;p=ghc-base.git

diff --git a/Makefile b/Makefile
index 1240ea8..5157ef1 100644
--- 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.29 2002/05/31 12:22:33 panne Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -28,14 +28,34 @@ ALL_DIRS = \
 	Network \
 	NHC \
 	System \
+	System/Console \
 	System/Mem \
 	System/IO \
 	Text \
+	Text/Html \
 	Text/PrettyPrint \
+	Text/ParserCombinators \
+	Text/ParserCombinators/Parsec \
 	Text/Regex \
-	Text/Show
+	Text/Show \
+	Text/Read
 
-PKG=core
+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
@@ -44,29 +64,63 @@ GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
 	rm -f $@
 	$(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
 
-boot :: GHC/PrimOpWrappers.hs
+boot :: GHC/PrimopWrappers.hs
 
+EXTRA_SRCS  += 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
 
-#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)
+EXCLUDED_HADDOCK_SRCS = \
+	Data/Generics.hs \
+	GHC/PArr.hs
 
-lib : GHC/Prim.hi-boot
+HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
 
-SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional
+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 >$@
 
 # -----------------------------------------------------------------------------
 
 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
+