X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=inline;f=Makefile;h=47276f3f99b552fd46ffbc87c6fd52da8d478630;hb=0b26bbe1ee1ffccacbb81c8e85dfa0047f99cee4;hp=96e1c735933186abd8f67ccf7c282aa47476c4bf;hpb=7de50399a42ee49b0473b7b6eea2b44a2f941a12;p=ghc-base.git

diff --git a/Makefile b/Makefile
index 96e1c73..47276f3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.9 2002/02/05 17:32:24 simonmar Exp $
+# $Id: Makefile,v 1.16 2002/02/13 11:51:40 simonmar Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -28,6 +28,7 @@ ALL_DIRS = \
 	Network \
 	NHC \
 	System \
+	System/Console \
 	System/Mem \
 	System/IO \
 	Text \
@@ -36,7 +37,22 @@ ALL_DIRS = \
 	Text/Regex \
 	Text/Show
 
-PKG=core
+PACKAGE = base
+
+ifneq "$(HavePosixRegex)" "YES"
+EXCLUDED_SRCS += Text/Regex/Posix.hsc Text/Regex.hs
+endif
+
+SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude
+SRC_HSC2HS_OPTS += -Iinclude
+
+# -----------------------------------------------------------------------------
+# Per-module flags
+
+# ESSENTIAL, for getting reasonable performance from the I/O library:
+GHC/IOBase_HC_OPTS   		= -funbox-strict-fields 
+
+Data/Array/Storable_HC_OPTS 	= -funbox-strict-fields
 
 # -----------------------------------------------------------------------------
 # PrimOpWrappers
@@ -45,7 +61,7 @@ GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
 	rm -f $@
 	$(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
 
-boot :: GHC/PrimOpWrappers.hs
+boot :: GHC/PrimopWrappers.hs
 
 CLEAN_FILES += GHC/PrimopWrappers.hs
 
@@ -65,6 +81,30 @@ CLEAN_FILES += $(ALL_PRIMS)
 
 SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional
 
+#-----------------------------------------------------------------------------
+# 	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_BASE_GHCI_LIB_RULE=YES
+
+GHCI_LIBOBJS = $(HS_OBJS)
+
+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
+
+INSTALL_LIBS += HSbase1.o HSbase2.o
+
+endif # TARGETPLATFORM = i386-unknown-mingw32
+
+
 # -----------------------------------------------------------------------------
 
 include $(TOP)/mk/target.mk