[project @ 2002-04-10 15:57:16 by simonmar]

[ghc-base.git] / Makefile

diff --git a/Makefile b/Makefile
index 6d91aa4..72b6e72 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.15 2002/02/12 15:17:34 simonmar Exp $
+# $Id: Makefile,v 1.22 2002/03/25 15:49:26 sof Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -42,13 +42,17 @@ 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:
-GHC/IOBase_HC_OPTS             = -funbox-strict-fields 
-
-Data/Array/Storable_HC_OPTS    = -funbox-strict-fields
+SRC_HC_OPTS += -funbox-strict-fields
 
 # -----------------------------------------------------------------------------
 # PrimOpWrappers
@@ -61,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
 #
@@ -87,15 +75,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
@@ -105,3 +88,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
+
+