X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=7ed06cbcf110daddf460bafd57d55d8e3cb0782f;hb=26cb781c1a14407f01fc966a8cf9cde17d4faf0d;hp=8820316cac6d4b9a81e0319c84339f44f5be7e70;hpb=627277bde24e59bbb07a701ba4196bc61f8fa981;p=ghc-base.git

diff --git a/Makefile b/Makefile
index 8820316..7ed06cb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.40 2002/12/20 09:31:11 simonmar Exp $
+# $Id: Makefile,v 1.46 2003/07/24 13:53:20 simonmar Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -14,7 +14,9 @@ ALL_DIRS = \
 	Control/Monad \
 	Control/Monad/ST \
 	Data \
+	Data/Generics \
 	Data/Array \
+	Data/Array/IO \
 	Data/STRef \
 	Debug \
 	Debug/QuickCheck \
@@ -56,9 +58,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) $@
 	$(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
+endif
 
 boot :: GHC/PrimopWrappers.hs
 
@@ -97,7 +108,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)" \