X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=ebc5f2e22fe854a93cbf687ba4fa86619941d19c;hb=b847c4decf42a5bc503c38bcc74a8d3c5fbf35eb;hp=249f6aaec7cc1e4503e0e2d21c1cac5d7a739e87;hpb=89aaf5e296b0d787ecd725f25c1c8728501f9c87;p=ghc-base.git

diff --git a/Makefile b/Makefile
index 249f6aa..ebc5f2e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.41 2003/03/06 09:51:03 simonmar Exp $
+# $Id: Makefile,v 1.47 2003/07/31 17:45:22 ross Exp $
 
 TOP=..
 include $(TOP)/mk/boilerplate.mk
@@ -14,6 +14,7 @@ ALL_DIRS = \
 	Control/Monad \
 	Control/Monad/ST \
 	Data \
+	Data/Generics \
 	Data/Array \
 	Data/Array/IO \
 	Data/STRef \
@@ -32,7 +33,6 @@ ALL_DIRS = \
 	Text/Html \
 	Text/PrettyPrint \
 	Text/ParserCombinators \
-	Text/ParserCombinators/Parsec \
 	Text/Regex \
 	Text/Show \
 	Text/Read
@@ -57,9 +57,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
 
@@ -98,7 +107,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)" \