X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=fab55a2ef06d0b976d41e3dd48972c17741924c1;hb=810d9b3d5b5f0c803903ffec6a2f35ab7cbefcb2;hp=2d87d9b20a779aaee13c949d4135e49bc64cd5fa;hpb=7f1f4e7a695c402ddd3a1dc2cc7114e649a78ebc;p=ghc-base.git

diff --git a/Makefile b/Makefile
index 2d87d9b..fab55a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,12 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.1 2001/06/28 14:15:01 simonmar Exp $
+# $Id: Makefile,v 1.31 2002/06/08 13:11:27 panne Exp $
 
-TOP=../..
+TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-ifeq "$(way)" ""
-SUBDIRS = cbits
-else
-SUBDIRS=
-endif
+# -----------------------------------------------------------------------------
+
+SUBDIRS = cbits include
 
 ALL_DIRS = \
 	Control \
@@ -19,6 +17,7 @@ ALL_DIRS = \
 	Data/Array \
 	Database \
 	Debug \
+	Debug/QuickCheck \
 	FileFormat \
 	Foreign \
 	Foreign/C \
@@ -29,46 +28,109 @@ ALL_DIRS = \
 	Network \
 	NHC \
 	System \
+	System/Console \
+	System/Mem \
 	System/IO \
 	Text \
-	Text/Show
+	Text/Html \
+	Text/PrettyPrint \
+	Text/ParserCombinators \
+	Text/ParserCombinators/Parsec \
+	Text/Regex \
+	Text/Show \
+	Text/Read
+
+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
+
+GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
+	rm -f $@
+	$(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
+
+boot :: GHC/PrimopWrappers.hs
 
-PRE_SRCS += $(wildcard $(patsubst %, %/*.hsc, $(ALL_DIRS)))
-SRC_HSC2HS_OPTS += -Iinclude -I.
+EXTRA_SRCS  += GHC/PrimopWrappers.hs
+CLEAN_FILES += GHC/PrimopWrappers.hs
 
-ALL_HS_SRCS = $(wildcard $(patsubst %, %/*.hs, . $(ALL_DIRS)))
-ALL_LHS_SRCS += $(wildcard GHC/*.lhs)
-ALL_HS_OBJS = $(patsubst %.hs, %.o, $(ALL_HS_SRCS)) \
-	$(patsubst %.lhs, %.o, $(ALL_LHS_SRCS))
+#-----------------------------------------------------------------------------
+# 	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 [due to a bug in the GNU
+#      linker.]
 
+OBJECT_FILEFORMAT=unknown
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+OBJECT_FILEFORMAT=PEi
+endif
+ifeq "$(TARGETPLATFORM)" "i386-unknown-cygwin32"
+OBJECT_FILEFORMAT=PEi
+endif
+
+ifeq "$(OBJECT_FILEFORMAT)" "PEi"
 
-srcs : $(HS_SRCS) GHC/Prim.$(way_)hi
+# Turn off standard rule which creates HSbase.o from LIBOBJS.
+DONT_WANT_STD_GHCI_LIB_RULE=YES
 
-# dependencies between .hsc files
-GHC/IO.hs : GHC/Handle.hs
+GHCI_LIBOBJS = $(HS_OBJS)
 
-GHC/Prim.$(way_)hi : GHC/Prim.hi-boot
-	cp $< $@
+INSTALL_LIBS += HSbase1.o HSbase2.o HSbase3.o
 
-SRC_HC_OPTS += -cpp -fglasgow-exts -fvia-C -I$(FPTOOLS_TOP)/ghc/includes -Iinclude -package-name std -H128m $(GhcLibHcOpts)
+endif # OBJECT_FILEFORMAT = PEi
+
+
+# -----------------------------------------------------------------------------
+# Doc building with Haddock
 
-LIBNAME = libHScore$(_way).a
+EXCLUDED_HADDOCK_SRCS = \
+	Data/Generics.hs \
+	GHC/PArr.hs
 
-CLEAN_FILES += $(ALL_HS_OBJS)
+HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
 
-all :: $(LIBNAME)
+HADDOCK = $(FPTOOLS_TOP)/haddock/src/haddock-inplace
 
-lib : srcs
-	$(GHC_INPLACE) $(HC_OPTS) --make $(ALL_HS_SRCS) $(ALL_LHS_SRCS)
+# Urgh, hack needed to ensure that the value of HS_SRCS is computed in time for
+# the docs rule below.
+PRE_SRCS := $(ALL_SRCS)
 
-$(LIBNAME) : lib
-	$(RM) $@
-	$(AR) $(AR_OPTS) $@ $(ALL_HS_OBJS)
-	$(RANLIB) $@
+.PHONY: docs
+haddock-docs : $(HS_PPS)
+	$(HADDOCK) -t "Haskell Core Libraries" -h -s "." $(HS_PPS)
 
-%.o : %.hs
-	$(GHC_INPLACE) $(HC_OPTS) --make $<
-%.o : %.lhs
-	$(GHC_INPLACE) $(HC_OPTS) --make $<
+%.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 "$(OBJECT_FILEFORMAT)" "PEi"
+HSbase.o : $(GHCI_LIBOBJS)
+	$(LD) -r $(LD_X) -o HSbase1.o $(filter     GHC/%, $(GHCI_LIBOBJS))
+	$(LD) -r $(LD_X) -o HSbase2.o $(filter     Text/%, $(GHCI_LIBOBJS))
+	$(LD) -r $(LD_X) -o HSbase3.o $(filter-out GHC/% Text/%, $(GHCI_LIBOBJS))
+	@touch HSbase.o
+endif # OBJECT_FILEFORMAT = PEi
+