X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=b18ef5934f084945b20be3dae006ed6476b5e31d;hb=6bbd4780e49f69a08ae373b5a07bd15b037013f7;hp=945354d3106d64756afac504672c85c8a8e480b4;hpb=308ebd84adf39e26dfdfd2acccdc1686f1834a18;p=ghc-base.git

diff --git a/Makefile b/Makefile
index 945354d..b18ef59 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.18 2002/02/17 20:05:35 panne Exp $
+# $Id: Makefile,v 1.37 2002/07/29 09:57:17 simonmar Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -15,18 +15,13 @@ ALL_DIRS = \
 	Control/Monad/ST \
 	Data \
 	Data/Array \
-	Database \
+	Data/STRef \
 	Debug \
 	Debug/QuickCheck \
-	FileFormat \
 	Foreign \
 	Foreign/C \
 	Foreign/Marshal \
 	GHC \
-	Hugs \
-	Language \
-	Network \
-	NHC \
 	System \
 	System/Console \
 	System/Mem \
@@ -34,8 +29,11 @@ ALL_DIRS = \
 	Text \
 	Text/Html \
 	Text/PrettyPrint \
+	Text/ParserCombinators \
+	Text/ParserCombinators/Parsec \
 	Text/Regex \
-	Text/Show
+	Text/Show \
+	Text/Read
 
 PACKAGE = base
 
@@ -52,9 +50,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
@@ -65,50 +61,56 @@ GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
 
 boot :: GHC/PrimopWrappers.hs
 
+EXTRA_SRCS  += 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)
-INSTALL_DATAS_WITH_DIRS += 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
 #
 # 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.
+#      have more than 65536 relocations in it [due to a bug in the GNU
+#      linker.]
 
+OBJECT_FILEFORMAT=unknown
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+OBJECT_FILEFORMAT=PEi
+endif
+ifeq "$(TARGETPLATFORM)" "i386-unknown-cygwin32"
+OBJECT_FILEFORMAT=PEi
+endif
+
+ifeq "$(OBJECT_FILEFORMAT)" "PEi"
 
 # 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 HSbase3.o
+
+endif # OBJECT_FILEFORMAT = PEi
 
-INSTALL_LIBS += HSbase1.o HSbase2.o
 
-endif # TARGETPLATFORM = i386-unknown-mingw32
+# -----------------------------------------------------------------------------
+# Doc building with Haddock
 
+EXCLUDED_HADDOCK_SRCS = \
+	Data/Generics.hs \
+	GHC/PArr.hs
+
+SRC_HADDOCK_OPTS += -t "Haskell Core Libraries (base package)" \
+	--no-implicit-prelude -p prologue.txt
 
 # -----------------------------------------------------------------------------
 
 include $(TOP)/mk/target.mk
 
+ifeq "$(OBJECT_FILEFORMAT)" "PEi"
+HSbase.o : $(GHCI_LIBOBJS)
+	$(LD) -r $(LD_X) -o HSbase1.o $(filter     GHC/%, $(GHCI_LIBOBJS))
+	$(LD) -r $(LD_X) -o HSbase2.o $(filter     Text/%, $(GHCI_LIBOBJS))
+	$(LD) -r $(LD_X) -o HSbase3.o $(filter-out GHC/% Text/%, $(GHCI_LIBOBJS))
+	@touch HSbase.o
+endif # OBJECT_FILEFORMAT = PEi
+