[project @ 2002-03-11 14:53:51 by simonmar]

[ghc-base.git] / Makefile

diff --git a/Makefile b/Makefile
index 47276f3..fce13a5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.16 2002/02/13 11:51:40 simonmar Exp $
+# $Id: Makefile,v 1.20 2002/03/05 14:31:47 simonmar Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -39,20 +39,20 @@ ALL_DIRS = \
 
 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
 
+# 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:
-GHC/IOBase_HC_OPTS             = -funbox-strict-fields 
-
-Data/Array/Storable_HC_OPTS    = -funbox-strict-fields
+SRC_HC_OPTS += -funbox-strict-fields
 
 # -----------------------------------------------------------------------------
 # PrimOpWrappers
@@ -65,22 +65,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
 #