[project @ 2002-06-05 14:08:24 by simonpj]

[ghc-base.git] / Makefile

diff --git a/Makefile b/Makefile
index e57f738..c2b9108 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.24 2002/04/24 16:13:26 simonmar Exp $
+# $Id: Makefile,v 1.30 2002/06/04 19:12:53 sof Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -35,6 +35,7 @@ ALL_DIRS = \
        Text/Html \
        Text/PrettyPrint \
        Text/ParserCombinators \
+       Text/ParserCombinators/Parsec \
        Text/Regex \
        Text/Show \
        Text/Read
@@ -65,6 +66,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,9 +74,18 @@ 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
@@ -83,20 +94,15 @@ GHCI_LIBOBJS = $(HS_OBJS)
 
 INSTALL_LIBS += HSbase1.o HSbase2.o
 
-endif # TARGETPLATFORM = i386-unknown-mingw32
+endif # OBJECT_FILEFORMAT = PEi
 
 
 # -----------------------------------------------------------------------------
 # Doc building with Haddock
 
 EXCLUDED_HADDOCK_SRCS = \
-       GHC/Err.lhs \
        Data/Generics.hs \
-       GHC/PArr.hs \
-       Control/Monad/Error.hs \
-       Control/Monad/Reader.hs \
-       Control/Monad/State.hs \
-       Control/Monad/Writer.hs
+       GHC/PArr.hs
 
 HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
 
@@ -114,16 +120,17 @@ haddock-docs : $(HS_PPS)
        $(GHC_INPLACE) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
 
 %.raw-hs : %.hs
-       $(GHC_INPLACE) $(HC_OPTS) -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
+       $(GHC_INPLACE) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
 
 # -----------------------------------------------------------------------------
 
 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