X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=b64e054603651c1ae70962f415447e23484e5b24;hb=833c0251f3de7eafbc42b4ce67360e84afd071f4;hp=25c14b50c12cf67215f2ba3e4d11a7aa5c2d5d2d;hpb=90f46a8830d97c24acecefbfb2a87b70588aa7e8;p=ghc-base.git

diff --git a/Makefile b/Makefile
index 25c14b5..b64e054 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,9 @@
-# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.3 2001/07/04 10:48:16 simonmar Exp $
-
-TOP=../..
+TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-ifeq "$(way)" ""
-SUBDIRS = cbits
-else
-SUBDIRS=
-endif
+# -----------------------------------------------------------------------------
+
+SUBDIRS = cbits include
 
 ALL_DIRS = \
 	Control \
@@ -16,59 +11,113 @@ ALL_DIRS = \
 	Control/Monad \
 	Control/Monad/ST \
 	Data \
+	Data/Generics \
 	Data/Array \
-	Database \
+	Data/Array/IO \
+	Data/STRef \
 	Debug \
-	FileFormat \
 	Foreign \
 	Foreign/C \
 	Foreign/Marshal \
 	GHC \
-	Hugs \
-	Language \
-	Network \
-	NHC \
 	System \
+	System/Console \
+	System/Mem \
 	System/IO \
+	System/Posix \
 	Text \
-	Text/Show
+	Text/Html \
+	Text/PrettyPrint \
+	Text/ParserCombinators \
+	Text/Regex \
+	Text/Show \
+	Text/Read
+
+PACKAGE = base
+
+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"
+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
 
-PRE_SRCS += $(wildcard $(patsubst %, %/*.hsc, $(ALL_DIRS)))
-SRC_HSC2HS_OPTS += -Iinclude -I.
+# These two lines are required for pre-processing ghc/compiler/prelude/primops.txt
+SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR)
+SRC_CPP_OPTS += ${GhcCppOpts}
 
-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))
-ALL_HS_HIS = $(patsubst %.o, %.hi, $(ALL_HS_OBJS))
+ifeq "$(BootingFromHc)" "YES"
+GHC/PrimopWrappers.hs:
+	touch GHC/PrimopWrappers.hs
+else
+GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
+	@$(RM) $@
+	$(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
+endif
+
+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 [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
 
-srcs : $(HS_SRCS) GHC/Prim.$(way_)hi
+ifeq "$(OBJECT_FILEFORMAT)" "PEi"
 
-# dependencies between .hsc files
-GHC/IO.hs : GHC/Handle.hs
+# Turn off standard rule which creates HSbase.o from LIBOBJS.
+DONT_WANT_STD_GHCI_LIB_RULE=YES
 
-GHC/Prim.$(way_)hi : GHC/Prim.hi-boot
-	cp $< $@
+GHCI_LIBOBJS = $(HS_OBJS)
 
-SRC_HC_OPTS += -cpp -fglasgow-exts -fvia-C -I$(FPTOOLS_TOP)/ghc/includes -Iinclude -package-name core -H128m $(GhcLibHcOpts)
+INSTALL_LIBS += HSbase1.o HSbase2.o HSbase3.o
 
-LIBNAME = libHScore$(_way).a
+endif # OBJECT_FILEFORMAT = PEi
 
-CLEAN_FILES += $(ALL_HS_OBJS) $(ALL_HS_HIS)
 
-all :: $(LIBNAME)
+# -----------------------------------------------------------------------------
+# Doc building with Haddock
 
-lib : srcs
-	$(GHC_INPLACE) $(HC_OPTS) --make $(ALL_HS_SRCS) $(ALL_LHS_SRCS)
+EXCLUDED_HADDOCK_SRCS = \
+	GHC/PrimopWrappers.hs \
+	GHC/PArr.hs
 
-$(LIBNAME) : lib
-	$(RM) $@
-	$(AR) $(AR_OPTS) $@ $(ALL_HS_OBJS)
-	$(RANLIB) $@
+SRC_HADDOCK_OPTS += -t "Haskell Core Libraries (base package)" \
+	--no-implicit-prelude -p prologue.txt
 
-%.o : %.hs
-	$(GHC_INPLACE) $(HC_OPTS) --make $<
-%.o : %.lhs
-	$(GHC_INPLACE) $(HC_OPTS) --make $<
+# -----------------------------------------------------------------------------
 
 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
+