X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=72b6e722aad5310f0f028b2fd6b2146691b72160;hb=dac2284b562a8d7bc52ae9ca5c7f83a9de83c083;hp=96e1c735933186abd8f67ccf7c282aa47476c4bf;hpb=7de50399a42ee49b0473b7b6eea2b44a2f941a12;p=haskell-directory.git

diff --git a/Makefile b/Makefile
index 96e1c73..72b6e72 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.22 2002/03/25 15:49:26 sof 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
+
+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
@@ -45,27 +61,38 @@ 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
 
-# -----------------------------------------------------------------------------
-# GHC/Prim.hi-boot
+#-----------------------------------------------------------------------------
+# 	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.
 
-GHC/Prim.$(way_)hi	: GHC/Prim.hi-boot
-	cp $< $@
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
-ALL_PRIMS = GHC/Prim.hi $(foreach way, $(WAYS), GHC/Prim.$(way)_hi)
+# Turn off standard rule which creates HSbase.o from LIBOBJS.
+DONT_WANT_STD_GHCI_LIB_RULE=YES
 
-lib  : $(ALL_PRIMS)
+GHCI_LIBOBJS = $(HS_OBJS)
 
-boot :: $(ALL_PRIMS)
+INSTALL_LIBS += HSbase1.o HSbase2.o
 
-CLEAN_FILES += $(ALL_PRIMS)
+endif # TARGETPLATFORM = i386-unknown-mingw32
 
-SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional
 
 # -----------------------------------------------------------------------------
 
 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
+
+