X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=72446d9c85051130db3c97bb37ac1b8c09266878;hb=1ae0823ca86798e2a17f2dd2124971bcae07d1b5;hp=e57f7380321952b85458ba354870cfa077c431fc;hpb=7887b9e7f59b24c276eeedb74df6ad547c99ec01;p=haskell-directory.git

diff --git a/Makefile b/Makefile
index e57f738..72446d9 100644
--- 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.43 2003/05/30 09:19:39 simonpj Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -15,34 +15,32 @@ ALL_DIRS = \
 	Control/Monad/ST \
 	Data \
 	Data/Array \
-	Database \
+	Data/Array/IO \
+	Data/STRef \
 	Debug \
 	Debug/QuickCheck \
-	FileFormat \
 	Foreign \
 	Foreign/C \
 	Foreign/Marshal \
 	GHC \
-	Hugs \
-	Language \
-	Network \
-	NHC \
 	System \
 	System/Console \
 	System/Mem \
 	System/IO \
+	System/Posix \
 	Text \
 	Text/Html \
 	Text/PrettyPrint \
 	Text/ParserCombinators \
+	Text/ParserCombinators/Parsec \
 	Text/Regex \
 	Text/Show \
 	Text/Read
 
 PACKAGE = base
 
-SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude
-SRC_HSC2HS_OPTS += -Iinclude
+SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude -\#include HsBase.h
+SRC_HSC2HS_OPTS += -Iinclude -I$(FPTOOLS_TOP)/ghc/includes
 
 # Make sure we can get hold of regex.h
 ifneq "$(HavePosixRegex)" "YES"
@@ -60,11 +58,12 @@ SRC_HC_OPTS += -funbox-strict-fields
 # PrimOpWrappers
 
 GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
-	rm -f $@
+	@$(RM) $@
 	$(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
 
 boot :: GHC/PrimopWrappers.hs
 
+EXTRA_SRCS  += GHC/PrimopWrappers.hs
 CLEAN_FILES += GHC/PrimopWrappers.hs
 
 #-----------------------------------------------------------------------------
@@ -72,58 +71,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 = \
-	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
-
-HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS))))
-
-HADDOCK = $(FPTOOLS_TOP)/haddock/src/haddock-inplace
+	GHC/PrimopWrappers.hs \
+	GHC/PArr.hs
 
-# Urgh, hack needed to ensure that the value of HS_SRCS is computed in time for
-# the docs rule below.
-PRE_SRCS := $(ALL_SRCS)
-
-.PHONY: docs
-haddock-docs : $(HS_PPS)
-	$(HADDOCK) -t "Haskell Core Libraries" -h -s "." $(HS_PPS)
-
-%.raw-hs : %.lhs
-	$(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 >$@
+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