[project @ 2002-04-24 16:10:21 by simonmar]

[ghc-base.git] / Makefile

diff --git a/Makefile b/Makefile
index 5f81619..5e62d0c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.17 2002/02/14 14:08:25 simonmar Exp $
+# $Id: Makefile,v 1.23 2002/04/11 12:03:43 simonpj Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -34,8 +34,10 @@ ALL_DIRS = \
        Text \
        Text/Html \
        Text/PrettyPrint \
+       Text/ParserCombinators \
        Text/Regex \
-       Text/Show
+       Text/Show \
+       Text/Read
 
 PACKAGE = base
 
@@ -52,9 +54,7 @@ endif
 # 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
+SRC_HC_OPTS += -funbox-strict-fields
 
 # -----------------------------------------------------------------------------
 # PrimOpWrappers
@@ -67,22 +67,6 @@ boot :: GHC/PrimopWrappers.hs
 
 CLEAN_FILES += GHC/PrimopWrappers.hs
 
-# -----------------------------------------------------------------------------
-# GHC/Prim.hi-boot
-
-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)
-
-SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional
-
 #-----------------------------------------------------------------------------
 #      Building the library for GHCi
 #
@@ -93,15 +77,10 @@ SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
 # Turn off standard rule which creates HSbase.o from LIBOBJS.
-DONT_WANT_BASE_GHCI_LIB_RULE=YES
+DONT_WANT_STD_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
@@ -111,3 +90,11 @@ endif # TARGETPLATFORM = i386-unknown-mingw32
 
 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
+
+