X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=8cc4bf39f540a3298b4cc0214d227c93e43aaa8b;hb=9a53a070bb647bd7796596e27a6348ae3ba6eed7;hp=5e62d0c3c3c64db4c862aebbdc22f133ae0ad484;hpb=05e43a9bd25232efced01ce45d00b3b3ba12af51;p=ghc-base.git

diff --git a/Makefile b/Makefile
index 5e62d0c..8cc4bf3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.23 2002/04/11 12:03:43 simonpj Exp $
+# $Id: Makefile,v 1.36 2002/07/02 13:13:36 simonmar Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -15,6 +15,7 @@ ALL_DIRS = \
 	Control/Monad/ST \
 	Data \
 	Data/Array \
+	Data/STRef \
 	Database \
 	Debug \
 	Debug/QuickCheck \
@@ -35,6 +36,7 @@ ALL_DIRS = \
 	Text/Html \
 	Text/PrettyPrint \
 	Text/ParserCombinators \
+	Text/ParserCombinators/Parsec \
 	Text/Regex \
 	Text/Show \
 	Text/Read
@@ -65,6 +67,7 @@ GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
 
 boot :: GHC/PrimopWrappers.hs
 
+EXTRA_SRCS  += GHC/PrimopWrappers.hs
 CLEAN_FILES += GHC/PrimopWrappers.hs
 
 #-----------------------------------------------------------------------------
@@ -72,29 +75,48 @@ CLEAN_FILES += GHC/PrimopWrappers.hs
 #
 # 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_STD_GHCI_LIB_RULE=YES
 
 GHCI_LIBOBJS = $(HS_OBJS)
 
-INSTALL_LIBS += HSbase1.o HSbase2.o
+INSTALL_LIBS += HSbase1.o HSbase2.o HSbase3.o
 
-endif # TARGETPLATFORM = i386-unknown-mingw32
+endif # OBJECT_FILEFORMAT = PEi
 
 
 # -----------------------------------------------------------------------------
+# 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 "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+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-out 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 # TARGETPLATFORM = i386-unknown-mingw32
-
+endif # OBJECT_FILEFORMAT = PEi