X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=b64e054603651c1ae70962f415447e23484e5b24;hb=5699b7d4aefa303fd560fad2ae583f5fde676c65;hp=52a8963e4da5ba5758983fe6189c51dd0de7d174;hpb=d5db6c9042041e88502be3ba755db6a85822d304;p=ghc-base.git

diff --git a/Makefile b/Makefile
index 52a8963..b64e054 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,3 @@
-# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.38 2002/09/06 14:34:15 simonmar Exp $
-
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
@@ -14,10 +11,11 @@ ALL_DIRS = \
 	Control/Monad \
 	Control/Monad/ST \
 	Data \
+	Data/Generics \
 	Data/Array \
+	Data/Array/IO \
 	Data/STRef \
 	Debug \
-	Debug/QuickCheck \
 	Foreign \
 	Foreign/C \
 	Foreign/Marshal \
@@ -31,14 +29,13 @@ ALL_DIRS = \
 	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_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
@@ -56,9 +53,18 @@ SRC_HC_OPTS += -funbox-strict-fields
 # -----------------------------------------------------------------------------
 # PrimOpWrappers
 
+# These two lines are required for pre-processing ghc/compiler/prelude/primops.txt
+SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR)
+SRC_CPP_OPTS += ${GhcCppOpts}
+
+ifeq "$(BootingFromHc)" "YES"
+GHC/PrimopWrappers.hs:
+	touch GHC/PrimopWrappers.hs
+else
 GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
-	rm -f $@
+	@$(RM) $@
 	$(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
+endif
 
 boot :: GHC/PrimopWrappers.hs
 
@@ -97,7 +103,7 @@ endif # OBJECT_FILEFORMAT = PEi
 # Doc building with Haddock
 
 EXCLUDED_HADDOCK_SRCS = \
-	Data/Generics.hs \
+	GHC/PrimopWrappers.hs \
 	GHC/PArr.hs
 
 SRC_HADDOCK_OPTS += -t "Haskell Core Libraries (base package)" \